Skip to content

remove unecessary nullptr check before 'delete' and 'delete[]' #480

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

remove unecessary nullptr check before 'delete' and 'delete[]' #480

Show file tree
Hide file tree
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
31 changes: 12 additions & 19 deletions libraries/openexr/IlmImf/ImfDeepScanLineInputFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,7 @@ LineBuffer::LineBuffer ():

LineBuffer::~LineBuffer ()
{
if (compressor != 0)
delete compressor;
delete compressor;
}

} // namespace
Expand Down Expand Up @@ -295,14 +294,12 @@ DeepScanLineInputFile::Data::Data (int numThreads):
DeepScanLineInputFile::Data::~Data ()
{
for (size_t i = 0; i < lineBuffers.size(); i++)
if (lineBuffers[i] != 0)
delete lineBuffers[i];
delete lineBuffers[i];

for (size_t i = 0; i < slices.size(); i++)
delete slices[i];

if (sampleCountTableComp != 0)
delete sampleCountTableComp;
delete sampleCountTableComp;

if (multiPartBackwardSupport)
delete multiPartFile;
Expand Down Expand Up @@ -513,7 +510,7 @@ readPixelData (InputStreamMutex *streamData,
{
// (TODO) check if the packed data size is too big?
// (TODO) better memory management. Don't delete buffer all the time.
if (buffer != 0) delete[] buffer;
delete[] buffer;
buffer = new char[packedDataSize];
streamData->is->read (buffer, packedDataSize);
}
Expand Down Expand Up @@ -612,8 +609,7 @@ LineBufferTask::execute ()
// (TODO) optimize this. don't do this every time.
//

if (_lineBuffer->compressor != 0)
delete _lineBuffer->compressor;
delete _lineBuffer->compressor;
Int64 maxBytesPerLine = 0;
for (int i = _lineBuffer->minY - _ifd->minY;
i <= maxY - _ifd->minY;
Expand Down Expand Up @@ -975,19 +971,19 @@ DeepScanLineInputFile::DeepScanLineInputFile
}
catch (IEX_NAMESPACE::BaseExc &e)
{
if (is) delete is;
if (_data && _data->_streamData) delete _data->_streamData;
if (_data) delete _data;
delete is;
if (_data) delete _data->_streamData;
delete _data;

REPLACE_EXC (e, "Cannot read image file "
"\"" << fileName << "\". " << e);
throw;
}
catch (...)
{
if (is) delete is;
if (_data && _data->_streamData) delete _data->_streamData;
if (_data) delete _data;
delete is;
if (_data) delete _data->_streamData;
delete _data;

throw;
}
Expand Down Expand Up @@ -1755,10 +1751,7 @@ void DeepScanLineInputFile::readPixelSampleCounts (const char* rawPixelData,
}
}

if(decomp)
{
delete decomp;
}
delete decomp;
}


Expand Down
16 changes: 5 additions & 11 deletions libraries/openexr/IlmImf/ImfDeepScanLineOutputFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,8 @@ LineBuffer::LineBuffer (int linesInBuffer) :

LineBuffer::~LineBuffer ()
{
if (compressor != 0)
delete compressor;

if (sampleCountTableCompressor != 0)
delete sampleCountTableCompressor;
delete compressor;
delete sampleCountTableCompressor;
}

} // namespace
Expand Down Expand Up @@ -265,8 +262,7 @@ DeepScanLineOutputFile::Data::Data (int numThreads):
DeepScanLineOutputFile::Data::~Data ()
{
for (size_t i = 0; i < lineBuffers.size(); i++)
if (lineBuffers[i] != 0)
delete lineBuffers[i];
delete lineBuffers[i];

for (size_t i = 0; i < slices.size(); i++)
delete slices[i];
Expand Down Expand Up @@ -752,8 +748,7 @@ LineBufferTask::execute ()
//

// (TODO) don't do this all the time.
if (_lineBuffer->compressor != 0)
delete _lineBuffer->compressor;
delete _lineBuffer->compressor;
_lineBuffer->compressor = newCompressor (_ofd->header.compression(),
maxBytesPerLine,
_ofd->header);
Expand Down Expand Up @@ -951,8 +946,7 @@ DeepScanLineOutputFile::initialize (const Header &header)
_data->header);
_data->format = defaultFormat (compressor);
_data->linesInBuffer = numLinesInBuffer (compressor);
if (compressor != 0)
delete compressor;
delete compressor;

int lineOffsetSize = (_data->maxY - _data->minY +
_data->linesInBuffer) / _data->linesInBuffer;
Expand Down
28 changes: 13 additions & 15 deletions libraries/openexr/IlmImf/ImfDeepTiledInputFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ readTileData (InputStreamMutex *streamData,
{
// (TODO) check if the packed data size is too big?
// (TODO) better memory management here. Don't delete buffer everytime.
if (buffer != 0) delete[] buffer;
delete[] buffer;
buffer = new char[dataSize];
streamData->is->read (buffer, dataSize);
}
Expand Down Expand Up @@ -611,8 +611,7 @@ TileBufferTask::execute ()
}

// (TODO) don't do this every time.
if (_tileBuffer->compressor != 0)
delete _tileBuffer->compressor;
delete _tileBuffer->compressor;
_tileBuffer->compressor = newTileCompressor
(_ifd->header.compression(),
maxBytesPerTileLine,
Expand Down Expand Up @@ -824,19 +823,19 @@ DeepTiledInputFile::DeepTiledInputFile (const char fileName[], int numThreads):
}
catch (IEX_NAMESPACE::BaseExc &e)
{
if (is) delete is;
if (_data && !_data->multiPartBackwardSupport && _data->_streamData) delete _data->_streamData;
if (_data) delete _data;
delete is;
if (_data && !_data->multiPartBackwardSupport) delete _data->_streamData;
delete _data;

REPLACE_EXC (e, "Cannot open image file "
"\"" << fileName << "\". " << e);
throw;
}
catch (...)
{
if (is) delete is;
if (_data && !_data->multiPartBackwardSupport && _data->_streamData) delete _data->_streamData;
if (_data) delete _data;
delete is;
if (_data && !_data->multiPartBackwardSupport) delete _data->_streamData;
delete _data;

throw;
}
Expand Down Expand Up @@ -879,17 +878,17 @@ DeepTiledInputFile::DeepTiledInputFile (OPENEXR_IMF_INTERNAL_NAMESPACE::IStream
}
catch (IEX_NAMESPACE::BaseExc &e)
{
if (_data && !_data->multiPartBackwardSupport && _data->_streamData) delete _data->_streamData;
if (_data) delete _data;
if (_data && !_data->multiPartBackwardSupport) delete _data->_streamData;
delete _data;

REPLACE_EXC (e, "Cannot open image file "
"\"" << is.fileName() << "\". " << e);
throw;
}
catch (...)
{
if (_data && !_data->multiPartBackwardSupport && _data->_streamData) delete _data->_streamData;
if (_data) delete _data;
if (_data && !_data->multiPartBackwardSupport) delete _data->_streamData;
delete _data;

throw;
}
Expand Down Expand Up @@ -1052,8 +1051,7 @@ DeepTiledInputFile::~DeepTiledInputFile ()
{
if (!_data->memoryMapped)
for (size_t i = 0; i < _data->tileBuffers.size(); i++)
if (_data->tileBuffers[i]->buffer != 0)
delete [] _data->tileBuffers[i]->buffer;
delete [] _data->tileBuffers[i]->buffer;

if (_data->_deleteStream)
delete _data->_streamData->is;
Expand Down
39 changes: 17 additions & 22 deletions libraries/openexr/IlmImf/ImfDeepTiledOutputFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,11 +252,8 @@ TileBuffer::TileBuffer ():

TileBuffer::~TileBuffer ()
{
if (compressor != 0)
delete compressor;

if (sampleCountTableCompressor != 0)
delete sampleCountTableCompressor;
delete compressor;
delete sampleCountTableCompressor;
}


Expand Down Expand Up @@ -993,8 +990,7 @@ TileBufferTask::execute ()
_tileBuffer->dataPtr = _tileBuffer->buffer;

// (TODO) don't do this all the time.
if (_tileBuffer->compressor != 0)
delete _tileBuffer->compressor;
delete _tileBuffer->compressor;
_tileBuffer->compressor = newTileCompressor
(_ofd->header.compression(),
maxBytesPerTileLine,
Expand Down Expand Up @@ -1074,19 +1070,19 @@ DeepTiledOutputFile::DeepTiledOutputFile
}
catch (IEX_NAMESPACE::BaseExc &e)
{
if (_data && _data->_streamData && _data->_streamData->os) delete _data->_streamData->os;
if (_data && _data->_streamData) delete _data->_streamData;
if (_data) delete _data;
if (_data && _data->_streamData) delete _data->_streamData->os;
if (_data) delete _data->_streamData;
delete _data;

REPLACE_EXC (e, "Cannot open image file "
"\"" << fileName << "\". " << e);
throw;
}
catch (...)
{
if (_data && _data->_streamData && _data->_streamData->os) delete _data->_streamData->os;
if (_data->_streamData) delete _data->_streamData;
if (_data) delete _data;
if (_data && _data->_streamData) delete _data->_streamData->os;
if (_data) delete _data->_streamData;
delete _data;

throw;
}
Expand Down Expand Up @@ -1118,17 +1114,17 @@ DeepTiledOutputFile::DeepTiledOutputFile
}
catch (IEX_NAMESPACE::BaseExc &e)
{
if (_data && _data->_streamData) delete _data->_streamData;
if (_data) delete _data;
if (_data) delete _data->_streamData;
delete _data;

REPLACE_EXC (e, "Cannot open image file "
"\"" << os.fileName() << "\". " << e);
throw;
}
catch (...)
{
if (_data && _data->_streamData) delete _data->_streamData;
if (_data) delete _data;
if (_data) delete _data->_streamData;
delete _data;

throw;
}
Expand All @@ -1154,15 +1150,15 @@ DeepTiledOutputFile::DeepTiledOutputFile(const OutputPartData* part)
}
catch (IEX_NAMESPACE::BaseExc &e)
{
if (_data) delete _data;
delete _data;

REPLACE_EXC (e, "Cannot initialize output part "
"\"" << part->partNumber << "\". " << e);
throw;
}
catch (...)
{
if (_data) delete _data;
delete _data;

throw;
}
Expand Down Expand Up @@ -1218,8 +1214,7 @@ DeepTiledOutputFile::initialize (const Header &header)

_data->format = defaultFormat (compressor);

if (compressor != 0)
delete compressor;
delete compressor;

_data->tileOffsets = TileOffsets (_data->tileDesc.mode,
_data->numXLevels,
Expand Down Expand Up @@ -1293,7 +1288,7 @@ DeepTiledOutputFile::~DeepTiledOutputFile ()
// this file or by a parent multipart file.
//

if (_data->partNumber == -1 && _data->_streamData)
if (_data->partNumber == -1)
delete _data->_streamData;

delete _data;
Expand Down
18 changes: 6 additions & 12 deletions libraries/openexr/IlmImf/ImfDwaCompressor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1922,8 +1922,7 @@ DwaCompressor::compress
if (outBufferSize > _outBufferSize)
{
_outBufferSize = outBufferSize;
if (_outBuffer == 0)
delete[] _outBuffer;
delete[] _outBuffer;
_outBuffer = new char[outBufferSize];
}

Expand Down Expand Up @@ -2435,8 +2434,7 @@ DwaCompressor::uncompress
if (_maxScanLineSize * numScanLines() > _outBufferSize)
{
_outBufferSize = _maxScanLineSize * numScanLines();
if (_outBuffer != 0)
delete[] _outBuffer;
delete[] _outBuffer;
_outBuffer = new char[_maxScanLineSize * numScanLines()];
}

Expand Down Expand Up @@ -3023,8 +3021,7 @@ DwaCompressor::initializeBuffers (size_t &outBufferSize)
if (maxLossyDctAcSize * numLossyDctChans > _packedAcBufferSize)
{
_packedAcBufferSize = maxLossyDctAcSize * numLossyDctChans;
if (_packedAcBuffer != 0)
delete[] _packedAcBuffer;
delete[] _packedAcBuffer;
_packedAcBuffer = new char[_packedAcBufferSize];
}

Expand All @@ -3035,16 +3032,14 @@ DwaCompressor::initializeBuffers (size_t &outBufferSize)
if (maxLossyDctDcSize * numLossyDctChans > _packedDcBufferSize)
{
_packedDcBufferSize = maxLossyDctDcSize * numLossyDctChans;
if (_packedDcBuffer != 0)
delete[] _packedDcBuffer;
delete[] _packedDcBuffer;
_packedDcBuffer = new char[_packedDcBufferSize];
}

if (rleBufferSize > _rleBufferSize)
{
_rleBufferSize = rleBufferSize;
if (_rleBuffer != 0)
delete[] _rleBuffer;
delete[] _rleBuffer;
_rleBuffer = new char[rleBufferSize];
}

Expand Down Expand Up @@ -3104,8 +3099,7 @@ DwaCompressor::initializeBuffers (size_t &outBufferSize)
if (planarUncBufferSize[i] > _planarUncBufferSize[i])
{
_planarUncBufferSize[i] = planarUncBufferSize[i];
if (_planarUncBuffer[i] != 0)
delete[] _planarUncBuffer[i];
delete[] _planarUncBuffer[i];
_planarUncBuffer[i] = new char[planarUncBufferSize[i]];
}
}
Expand Down
3 changes: 0 additions & 3 deletions libraries/openexr/IlmImf/ImfHuf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,11 +705,8 @@ hufFreeDecTable (HufDec *hdecod) // io: Decoding table
{
for (int i = 0; i < HUF_DECSIZE; i++)
{
if (hdecod[i].p)
{
delete [] hdecod[i].p;
hdecod[i].p = 0;
}
}
}

Expand Down
Loading