Skip to content

fix(tiff): 64-bit size for LONG-typed IPTC data #5577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lgritz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(tiff): 64-bit size for LONG-typed IPTC data #5577

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/tiff.imageio/tiffinput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1554,12 +1554,13 @@ TIFFInput::readspec(bool read_meta)

// Search for IPTC metadata in IIM form -- but older versions of
// libtiff botch the size, so ignore it for very old libtiff.
int iptcsize = 0;
uint32_t iptccount = 0;
const char* iptcdata = nullptr;
TypeDesc iptctype = tiffgetfieldtype(TIFFTAG_RICHTIFFIPTC);
if (TIFFGetField(m_tif, TIFFTAG_RICHTIFFIPTC, &iptcsize, &iptcdata)
&& iptcsize > 0) {
if (TIFFGetField(m_tif, TIFFTAG_RICHTIFFIPTC, &iptccount, &iptcdata)
&& iptccount > 0 && iptcdata) {
std::vector<char> iptc;
size_t iptcsize = iptccount;
if (iptctype.size() == 4) {
// Some TIFF files in the wild inexplicably think their IPTC
// data are stored as longs, and we have to undo any byte
Expand All @@ -1571,7 +1572,7 @@ TIFFInput::readspec(bool read_meta)
} else {
iptc.assign(iptcdata, iptcdata + iptcsize);
}
decode_iptc_iim(&iptc[0], iptcsize, m_spec);
decode_iptc_iim(string_view(iptc.data(), iptc.size()), m_spec);
}

// Search for an XML packet containing XMP (IPTC, Exif, etc.)
Expand Down
Loading