gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 23:50:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r22062) -Fix: memory leak when saving fails mid-way

Browse Source
This commit is contained in:
rubidium 2011-02-11 21:30:26 +00:00
parent 296af35741
commit 7de823b1bd
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/saveload/saveload.cpp
View File

@ -2012,6 +2012,12 @@ struct ZlibSaveFilter : SaveFilter {
if (deflateInit(&this->z, compression_level) != Z_OK) SlError(STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR, "cannot initialize compressor"); if (deflateInit(&this->z, compression_level) != Z_OK) SlError(STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR, "cannot initialize compressor");
} }
/** Clean up what we allocated. */
~ZlibSaveFilter()
{
deflateEnd(&this->z);
}
/** /**
* Helper loop for writing the data. * Helper loop for writing the data.
* @param p The bytes to write. * @param p The bytes to write.
@ -2056,7 +2062,6 @@ struct ZlibSaveFilter : SaveFilter {
{ {
this->WriteLoop(NULL, 0, Z_FINISH); this->WriteLoop(NULL, 0, Z_FINISH);
this->chain->Finish(); this->chain->Finish();
deflateEnd(&this->z);
} }
}; };
@ -2134,6 +2139,12 @@ struct LZMASaveFilter : SaveFilter {
if (lzma_easy_encoder(&this->lzma, compression_level, LZMA_CHECK_CRC32) != LZMA_OK) SlError(STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR, "cannot initialize compressor"); if (lzma_easy_encoder(&this->lzma, compression_level, LZMA_CHECK_CRC32) != LZMA_OK) SlError(STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR, "cannot initialize compressor");
} }
/** Clean up what we allocated. */
~LZMASaveFilter()
{
lzma_end(&this->lzma);
}
/** /**
* Helper loop for writing the data. * Helper loop for writing the data.
* @param p The bytes to write. * @param p The bytes to write.
@ -2170,7 +2181,6 @@ struct LZMASaveFilter : SaveFilter {
{ {
this->WriteLoop(NULL, 0, LZMA_FINISH); this->WriteLoop(NULL, 0, LZMA_FINISH);
this->chain->Finish(); this->chain->Finish();
lzma_end(&this->lzma);
} }
}; };