libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-25 12:05:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DRASCULA: Fix random crash when loading pendulum scene savegame

Browse Source 
When saving from the pendulum scene the curX and curY values are
negative while the curWidth and curHeight values are unset. This
causes random crashes as we may do an array out of bound access
when enterRoom() is called at the end of the load.
This commit is contained in:
Thierry Crozat 2016-04-11 03:40:17 +01:00
parent a97f9d0ec6
commit d4a747705f
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/drascula/saveload.cpp
View File

@ -300,6 +300,16 @@ bool DrasculaEngine::loadGame(int slot) {
if (!sscanf(currentData, "%d.ald", &roomNum)) {
error("Bad save format");
}
// When loading room 102 while being attached below the pendulum Some variables
// are not correctly set and can cause random crashes when calling enterRoom below.
// The crash occurs in moveCharacters() when accessing factor_red[curY + curHeight].
if (roomNum == 102 && flags[1] == 2) {
curX = 103;
curY = 108;
curWidth = curHeight = 0;
}
enterRoom(roomNum);
selectVerb(kVerbNone);