[Scummvm-cvs-logs] scummvm master -> fd40cb22244f68af7e4260b3133f2466607a0efb

[eriktorbjorn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fd40cb2224 SCUMM: Fix potential crash in o5_setClass()


Commit: fd40cb22244f68af7e4260b3133f2466607a0efb
    https://github.com/scummvm/scummvm/commit/fd40cb22244f68af7e4260b3133f2466607a0efb
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2014-07-12T10:44:37+02:00

Commit Message:
SCUMM: Fix potential crash in o5_setClass()

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.

Changed paths:
    engines/scumm/script_v5.cpp



diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 2cda989..91afa85 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -544,7 +544,7 @@ void ScummEngine_v5::o5_setClass() {
 		} else if (cls == 0) {
 			// Class '0' means: clean all class data
 			_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");
 				a->_ignoreBoxes = false;
 				a->_forceClip = 0;