From 07e93a3de1200355c1c32e2c4cc15ec87e312602 Mon Sep 17 00:00:00 2001 From: Peter Hillman Date: Sat, 16 May 2020 12:37:31 +1200 Subject: [PATCH] check null pointer in broken tiled file handling Signed-off-by: Peter Hillman --- OpenEXR/IlmImf/ImfTiledInputFile.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/OpenEXR/IlmImf/ImfTiledInputFile.cpp b/OpenEXR/IlmImf/ImfTiledInputFile.cpp index 0bac84f364..e1159797cc 100644 --- a/OpenEXR/IlmImf/ImfTiledInputFile.cpp +++ b/OpenEXR/IlmImf/ImfTiledInputFile.cpp @@ -818,7 +818,10 @@ TiledInputFile::TiledInputFile (OPENEXR_IMF_INTERNAL_NAMESPACE::IStream &is, int { for (size_t i = 0; i < _data->tileBuffers.size(); i++) { - delete [] _data->tileBuffers[i]->buffer; + if( _data->tileBuffers[i]) + { + delete [] _data->tileBuffers[i]->buffer; + } } } if (streamDataCreated) delete _data->_streamData; @@ -860,11 +863,14 @@ TiledInputFile::TiledInputFile (const Header &header, { for (size_t i = 0; i < _data->tileBuffers.size(); i++) { - delete [] _data->tileBuffers[i]->buffer; + if(_data->tileBuffers[i]) + { + delete [] _data->tileBuffers[i]->buffer; + } } } delete _data->_streamData; - delete _data; + delete _data; throw; } }