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

sanity check ScanlineInput bytesPerLine instead of lineOffset size #863

Merged
merged 3 commits into from
Nov 19, 2020
Merged

sanity check ScanlineInput bytesPerLine instead of lineOffset size #863

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2d321a
sanity check ScanlineInput bytesPerLine instead of lineOffset size
peterhillman Nov 12, 2020
c66efa1
Merge branch 'master' into scanline_bytesperline_sanitycheck
peterhillman Nov 13, 2020
db5e499
Merge branch 'master' into scanline_bytesperline_sanitycheck
cary-ilm Nov 19, 2020
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: 3 additions & 3 deletions src/lib/OpenEXR/ImfScanLineInputFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1135,14 +1135,14 @@ void ScanLineInputFile::initialize(const Header& header)
_data->linesInBuffer) / _data->linesInBuffer;

//
// avoid allocating excessive memory due to large lineOffsets table size.
// avoid allocating excessive memory due to large lineOffsets and bytesPerLine table sizes.
// If the chunktablesize claims to be large,
// check the file is big enough to contain the table before allocating memory
// check the file is big enough to contain the lineOffsets table before allocating memory
// in the bytesPerLineTable and the lineOffsets table.
// Attempt to read the last entry in the table. Either the seekg() or the read()
// call will throw an exception if the file is too small to contain the table
//
if (lineOffsetSize > gLargeChunkTableSize)
if (lineOffsetSize * _data->linesInBuffer > gLargeChunkTableSize)
{
Int64 pos = _streamData->is->tellg();
_streamData->is->seekg(pos + (lineOffsetSize-1)*sizeof(Int64));
Expand Down