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

Various checks to improve handling of damaged input files #643

Merged
merged 25 commits into from
Feb 4, 2020
Merged

Various checks to improve handling of damaged input files #643

merged 25 commits into from
Feb 4, 2020

Conversation

peterhillman
Copy link
Contributor

  • Prevent out-of-bounds reads by better sanity checking of input data
  • Fix memory leaks when exceptions are thrown from constructors when opening broken files
  • Fix memory leaks in test suite

@peterhillman
Force tile sizes to be less than INT_MAX bytes, in line with the maxi…
04c3467 
…mum dimensions of data windows

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
validate tiles have valid headers when raw reading tiles
7d24190 
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
Sanity check for input buffer overruns in RLE uncompress
d0303d1 
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
fixes for DWA uncompress: sanity check unknown data reading, off-by-o…
749ac87 
…ne error on max suffix string length

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
exrmakepreview: switch preview-to-full scaling vars from floats to do…
6e3d95a 
…ubles to prevent rounding causing overflows

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
prevent int overflow when calculating buffer offsets
2c5c1ae 
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
bypass SSE optimization when skipping subsampled channels
8b97a01 
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
check for bad bit counts in Huff encoded data
40c6dd5 
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
improve bad count detection in huf decompress
b1c9ddc 
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
sanity check data reads from PIZ data
41d7b7e 
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
fix memory leak when reading damaged PIZ files
904bc10 
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
abort when file claims to have excessive scanline data requirements
4dbf8c8 
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
avoid creating compression object just to compute numLinesInBuffer
8c1280e 
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
fix check for valid ruleSize
315265c 
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
fix memory leak on DeepTiledInput files: compressor for sample count …
55bdbc5 
…table wasn't deleted

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
fix memory leak in test suite
60dd4e5 
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
fixes to memory leak when constructors throw exceptions
801d880 
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
Fix cleanup when DeepScanLineInputFile constructor throws
714a210 
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
test for multipart threading was leaking memory
533320a 
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
fix test suite memory leak from testDeepTiledBasic
46ec601 
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Jan 23, 2020 •
edited
Loading

CLA Check
The committers are authorized under a signed CLA.

@peterhillman
missing header for ptrdiff_t
851b159 
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
meshula
meshula reviewed Jan 27, 2020
View reviewed changes
OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp Outdated
@@ -288,6 +288,7 @@ DeepTiledInputFile::Data::Data (int numThreads):
multiPartBackwardSupport(false),
numThreads(numThreads),
memoryMapped(false),
sampleCountTableComp(NULL),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NULLs are expected to be nullptr these days....

meshula
meshula reviewed Jan 27, 2020
View reviewed changes
OpenEXR/IlmImf/ImfHuf.cpp Outdated
@@ -1052,7 +1052,10 @@ hufUncompress (const char compressed[],
unsigned short raw[],
int nRaw)
{
if (nCompressed == 0)
//
// nead at least 20 bytes for header
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo "need"

meshula
meshula reviewed Jan 27, 2020
View reviewed changes
OpenEXR/IlmImf/ImfTiledInputFile.cpp Outdated
@@ -745,7 +745,10 @@ TiledInputFile::TiledInputFile (const char fileName[], int numThreads):

delete _data->_streamData;
}

if (_data)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these null checks aren't necessary, and there's a few in a row that check != 0 or the pointer. Be better to just squash them all to delete....

meshula
meshula reviewed Jan 27, 2020
View reviewed changes
Copy link
Contributor

@meshula meshula left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything checks out, there's a few super minor things, noted in local comments.

@peterhillman
Merge branch 'master' into securityfixes
b26f8ab
@peterhillman
minor tweaks and typo fixes
c264aef 
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@peterhillman
force x/y Sampling to 1 for Deep Scanline Images
41a99da 
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
meshula
meshula approved these changes Jan 28, 2020
View reviewed changes
Copy link
Contributor

@meshula meshula left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the changes!

@peterhillman peterhillman merged commit 89ce46f into AcademySoftwareFoundation:master Feb 4, 2020
@peterhillman peterhillman deleted the securityfixes branch February 4, 2020 02:10
@cary-ilm cary-ilm added this to the v2.5.0 milestone Apr 26, 2020
peterhillman referenced this pull request May 9, 2020
@peterhillman
Fix yet more memory leaks from constructor exceptions (#658)
2c37c4b 
* fix leak when maximum number of tiles is exceeded
* fix leak in InputPart constructor logic

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@meshula meshula meshula approved these changes

Assignees
No one assigned
Labels
v2.5.0
Projects
None yet
Milestone
v2.5.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@peterhillman @meshula @cary-ilm