aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2011-05-13 23:23:15 +0200
committerWillem Jan Palenstijn2011-05-13 23:29:23 +0200
commit47e7850b91a12a69ff4a65e9f0cf899d6f280049 (patch)
tree3b639a6642de54d888612743dd413de2f0b6b58f /engines
parent7b2792328153024ef8ffd23050393ddb3098f6b0 (diff)
downloadscummvm-rg350-47e7850b91a12a69ff4a65e9f0cf899d6f280049.tar.gz
scummvm-rg350-47e7850b91a12a69ff4a65e9f0cf899d6f280049.tar.bz2
scummvm-rg350-47e7850b91a12a69ff4a65e9f0cf899d6f280049.zip
SCI: Fix crash in vo with unloaded superclass
(cherry picked from commit 5fc5265b0d777744e8ff65305ddf0cf2da043204)
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/console.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 60bd129efc..7f0b641d83 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -3775,7 +3775,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