Skip to content
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

Jump to bottom

[027] Fix integer overflow #2179 #2194

Merged
merged 1 commit into from
Apr 6, 2022
Merged

[027] Fix integer overflow #2179 #2194

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
6 changes: 5 additions & 1 deletion src/jpgimage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,14 +288,18 @@ namespace Exiv2 {
// Write existing stuff after record,
// skip the current and all remaining IPTC blocks
long pos = sizeFront;
while (0 == Photoshop::locateIptcIrb(pPsData + pos, sizePsData - pos,
long nextSizeData = Safe::add<long>(sizePsData, -pos);
enforce(nextSizeData >= 0, kerCorruptedMetadata);
while (0 == Photoshop::locateIptcIrb(pPsData + pos, nextSizeData,
&record, &sizeHdr, &sizeIptc)) {
const long newPos = static_cast<long>(record - pPsData);
// Copy data up to the IPTC IRB
if (newPos > pos) {
append(psBlob, pPsData + pos, newPos - pos);
}
// Skip the IPTC IRB
nextSizeData = Safe::add<long>(sizePsData, -pos);
enforce(nextSizeData >= 0, kerCorruptedMetadata);
pos = newPos + sizeHdr + sizeIptc + (sizeIptc & 1);
}
if (pos < sizePsData) {
Expand Down