libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-10 12:55:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCUMM: Fix potential crash in o5_setClass()

Browse Source 
If 'obj' was exactly equal to _numActors, derefActor() would have
complained about it being an invalid actor. I haven't seen any bug
reports about this, so presumably it never actually happened.
This commit is contained in:
Torbjörn Andersson 2014-07-12 10:44:37 +02:00
parent bf90d36024
commit fd40cb2224
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/scumm/script_v5.cpp
View File

@ -544,7 +544,7 @@ void ScummEngine_v5::o5_setClass() {
} else if (cls == 0) { } else if (cls == 0) {
// Class '0' means: clean all class data // Class '0' means: clean all class data
_classData[obj] = 0; _classData[obj] = 0;
if ((_game.features & GF_SMALL_HEADER) && obj <= _numActors) { if ((_game.features & GF_SMALL_HEADER) && objIsActor(obj)) {
Actor *a = derefActor(obj, "o5_setClass"); Actor *a = derefActor(obj, "o5_setClass");
a->_ignoreBoxes = false; a->_ignoreBoxes = false;
a->_forceClip = 0; a->_forceClip = 0;