[Scummvm-cvs-logs] scummvm master -> 5fc5265b0d777744e8ff65305ddf0cf2da043204
wjp
wjp at usecode.org
Fri May 13 23:26:17 CEST 2011
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:
5fc5265b0d SCI: Fix crash in vo with unloaded superclass
Commit: 5fc5265b0d777744e8ff65305ddf0cf2da043204
https://github.com/scummvm/scummvm/commit/5fc5265b0d777744e8ff65305ddf0cf2da043204
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-05-13T14:23:15-07:00
Commit Message:
SCI: Fix crash in vo with unloaded superclass
Changed paths:
engines/sci/console.cpp
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 62dbfc7..5f5af19 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -3772,7 +3772,7 @@ int Console::printObject(reg_t pos) {
DebugPrintf(" -- member variables:\n");
for (i = 0; (uint)i < obj->getVarCount(); i++) {
DebugPrintf(" ");
- if (i < var_container->getVarCount()) {
+ if (var_container && i < var_container->getVarCount()) {
uint16 varSelector = var_container->getVarSelector(i);
DebugPrintf("[%03x] %s = ", varSelector, _engine->getKernel()->getSelectorName(varSelector).c_str());
} else
More information about the Scummvm-git-logs
mailing list