Ticket #1600: mi2-newnames.diff

scumm/resource.cpp

@@ -2111 +2111 @@
                 _numLocalObjects = _fileHandle.readUint16LE();   // 200
                 _numArray = 50;
                 _numVerbs = 100;
-                _numNewNames = 50;
+                // 50 isn't enough for MI2. See bug #936323.
+                _numNewNames = (_gameId == GID_MONKEY2) ? 100 : 50;
                 _objectRoomTable = NULL;
 
                 _fileHandle.readUint16LE();                      // 50

scumm/saveload.cpp

@@ -823 +823 @@
                                         _inventory[idx] = ser->loadUint16();
                                 }
                                 if (type == rtObjectName && ser->getVersion() >= VER(25)) {
-                                        _newNames[idx] = ser->loadUint16();
+                                        // 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();
                                 }
                         }
                 }