Skip to content

Avoid potential overflow #3526

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
dirkmueller wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −1
Open

Avoid potential overflow #3526

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: 8 additions & 1 deletion src/image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,14 @@ void Image::printIFDStructure(BasicIo& io, std::ostream& out, Exiv2::PrintStruct
// if ( offset > io.size() ) offset = 0; // Denial of service?

// #55 and #56 memory allocation crash test/data/POC8
const size_t allocate64 = (size * count) + pad + 20;
const size_t overhead = static_cast<size_t>(pad) + 20;
const size_t maxCount = (std::numeric_limits<size_t>::max() - overhead) / size;

// check for overflow before multiplying
if (static_cast<size_t>(count) > maxCount) {
throw Error(ErrorCode::kerInvalidMalloc);
}
const size_t allocate64 = (size * static_cast<size_t>(count)) + overhead;
if (allocate64 > io.size()) {
throw Error(ErrorCode::kerInvalidMalloc);
}
Expand Down
Loading