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

free memory if precalculateTileInfo throws #812

Merged
merged 1 commit into from
Aug 10, 2020
Merged

free memory if precalculateTileInfo throws #812

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
46 changes: 29 additions & 17 deletions OpenEXR/IlmImf/ImfMultiPartInputFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,25 +451,37 @@ MultiPartInputFile::Data::createTileOffsets(const Header& header)
// Precompute level and tile information
//

int* numXTiles;
int* numYTiles;
int* numXTiles = nullptr;
int* numYTiles = nullptr;
int numXLevels, numYLevels;
TileDescription tileDesc = header.tileDescription();
precalculateTileInfo (tileDesc,
minX, maxX,
minY, maxY,
numXTiles, numYTiles,
numXLevels, numYLevels);

TileOffsets* tileOffsets = new TileOffsets (tileDesc.mode,
numXLevels,
numYLevels,
numXTiles,
numYTiles);
delete [] numXTiles;
delete [] numYTiles;

return tileOffsets;
try
{

precalculateTileInfo (tileDesc,
minX, maxX,
minY, maxY,
numXTiles, numYTiles,
numXLevels, numYLevels);

TileOffsets* tileOffsets = new TileOffsets (tileDesc.mode,
numXLevels,
numYLevels,
numXTiles,
numYTiles);
delete [] numXTiles;
delete [] numYTiles;

return tileOffsets;

}
catch(...)
{
delete [] numXTiles;
delete [] numYTiles;
throw;
}

}


Expand Down
26 changes: 13 additions & 13 deletions OpenEXR/IlmImf/ImfTiledMisc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,23 +352,23 @@ getTiledChunkOffsetTableSize(const Header& header)
// Precompute level and tile information.
//

int* numXTiles;
int* numYTiles;
int* numXTiles=nullptr;
int* numYTiles=nullptr;
int numXLevels;
int numYLevels;
precalculateTileInfo (header.tileDescription(),
dataWindow.min.x, dataWindow.max.x,
dataWindow.min.y, dataWindow.max.y,
numXTiles, numYTiles,
numXLevels, numYLevels);

//
// Calculate lineOffsetSize.
//
Int64 lineOffsetSize = 0;
const TileDescription &desc = header.tileDescription();
try
{
precalculateTileInfo (header.tileDescription(),
dataWindow.min.x, dataWindow.max.x,
dataWindow.min.y, dataWindow.max.y,
numXTiles, numYTiles,
numXLevels, numYLevels);

//
// Calculate lineOffsetSize.
//
Int64 lineOffsetSize = 0;
const TileDescription &desc = header.tileDescription();
switch (desc.mode)
{
case ONE_LEVEL:
Expand Down