dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r12963) -Fix (r12960): loading some NewGRFs could cause an infinite loop.

Browse Source
This commit is contained in:
rubidium
2008-05-05 22:35:33 +00:00
parent 19b20a7dde
commit e7d125de58
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/fileio.cpp
View File

@@ -45,7 +45,7 @@ static Fio _fio;
/* Get current position in file */
uint32 FioGetPos()
{
return _fio.pos + (_fio.buffer - _fio.buffer_start) - FIO_BUFFER_SIZE;
return _fio.pos + (_fio.buffer - _fio.buffer_end);
}
const char *FioGetFilename(uint8 slot)
@@ -92,7 +92,11 @@ byte FioReadByte()
{
if (_fio.buffer == _fio.buffer_end) {
_fio.buffer = _fio.buffer_start;
_fio.pos += fread(_fio.buffer, 1, FIO_BUFFER_SIZE, _fio.cur_fh);
size_t size = fread(_fio.buffer, 1, FIO_BUFFER_SIZE, _fio.cur_fh);
_fio.pos += size;
_fio.buffer_end = _fio.buffer_start + size;
if (size == 0) return 0;
}
return *_fio.buffer++;
}