mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r20090) -Fix: savegames would (very likely) end with 128 KiB worth of useless zeros

release/1.1
rubidium 2010-07-08 18:45:52 +00:00
parent 4ce5c6d93d
commit 72bfda4634
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/saveload/saveload.cpp
View File

@ -1454,7 +1454,7 @@ struct ThreadedSave {
}; };
/** Save in chunks of 128 KiB. */ /** Save in chunks of 128 KiB. */
static const int MEMORY_CHUNK_SIZE = 128 * 1024; static const size_t MEMORY_CHUNK_SIZE = 128 * 1024;
/** Memory allocation for storing savegames in memory. */ /** Memory allocation for storing savegames in memory. */
static AutoFreeSmallVector<byte *, 16> _memory_savegame; static AutoFreeSmallVector<byte *, 16> _memory_savegame;
@ -1855,19 +1855,23 @@ static SaveOrLoadResult SaveFileToDisk(bool threaded)
if (!fmt->init_write(compression)) SlError(STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR, "cannot initialize compressor"); if (!fmt->init_write(compression)) SlError(STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR, "cannot initialize compressor");
{ uint i = 0;
uint i; size_t t = _ts.count;
if (_ts.count != _sl.offs_base) SlError(STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME, "Unexpected size of chunk"); if (_ts.count != _sl.offs_base) SlError(STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME, "Unexpected size of chunk");
for (i = 0; i != _memory_savegame.Length() - 1; i++) { while (t >= MEMORY_CHUNK_SIZE) {
_sl.buf = _memory_savegame[i]; _sl.buf = _memory_savegame[i++];
fmt->writer(MEMORY_CHUNK_SIZE); fmt->writer(MEMORY_CHUNK_SIZE);
t -= MEMORY_CHUNK_SIZE;
} }
if (t != 0) {
/* The last block is (almost) always not fully filled, so only write away /* The last block is (almost) always not fully filled, so only write away
* as much data as it is in there */ * as much data as it is in there */
_sl.buf = _memory_savegame[i]; _sl.buf = _memory_savegame[i];
fmt->writer(_ts.count % MEMORY_CHUNK_SIZE);
assert(t == _ts.count % MEMORY_CHUNK_SIZE);
fmt->writer(t);
} }
fmt->uninit_write(); fmt->uninit_write();