thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Increased _numNewNames from 50 to 100 to prevent overflow in MI2 endgame.

Browse source 
This should fix bug #936323. (There are still some game versions that use
50, but that can be fixed later, if the need arises.)

svn-id: r13598
This commit is contained in:
Torbjörn Andersson 2004-04-20 07:10:13 +00:00
parent 9defe4fc18
commit ac967bde63
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scumm/resource.cpp
View file

@ -2111,7 +2111,8 @@ void ScummEngine::readMAXS() {
_numLocalObjects = _fileHandle.readUint16LE(); // 200 _numLocalObjects = _fileHandle.readUint16LE(); // 200
_numArray = 50; _numArray = 50;
_numVerbs = 100; _numVerbs = 100;
_numNewNames = 50; // Used to be 50, which wasn't enough for MI2. See bug #936323.
_numNewNames = 100;
_objectRoomTable = NULL; _objectRoomTable = NULL;
_fileHandle.readUint16LE(); // 50 _fileHandle.readUint16LE(); // 50

6
scumm/saveload.cpp
View file

@ -823,6 +823,12 @@ void ScummEngine::saveLoadResource(Serializer *ser, int type, int idx) {
_inventory[idx] = ser->loadUint16(); _inventory[idx] = ser->loadUint16();
} }
if (type == rtObjectName && ser->getVersion() >= VER(25)) { if (type == rtObjectName && ser->getVersion() >= VER(25)) {
// Paranoia: We increased the possible number of new names
// for MI2 to fix bug #936323. The savegame format didn't
// change, but at least during the transition period there
// is a slight chance that we try to load more names than
// we have allocated space for. If so, discard them.
if (idx < _numNewNames)
_newNames[idx] = ser->loadUint16(); _newNames[idx] = ser->loadUint16();
} }
} }