aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2010-01-03 21:53:34 +0000
committerFilippos Karapetis2010-01-03 21:53:34 +0000
commitb92a744a04a17bfdce7d9fba5e90864375f281ac (patch)
treed2c21609e552649e836f3a313e40ad05effc8461
parentdccc1db768240fe7e8d814fae92606be6b5bfe47 (diff)
downloadscummvm-rg350-b92a744a04a17bfdce7d9fba5e90864375f281ac.tar.gz
scummvm-rg350-b92a744a04a17bfdce7d9fba5e90864375f281ac.tar.bz2
scummvm-rg350-b92a744a04a17bfdce7d9fba5e90864375f281ac.zip
sane_nodep() and sane_listp() should not be dummy functions when DISABLE_VALIDATIONS is set, so that the engine doesn't try and refer to null pointer objects (and subsequently crash)
svn-id: r46956
-rw-r--r--engines/sci/engine/klists.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/engines/sci/engine/klists.cpp b/engines/sci/engine/klists.cpp
index 2b2a9b4562..5a24ee7698 100644
--- a/engines/sci/engine/klists.cpp
+++ b/engines/sci/engine/klists.cpp
@@ -28,13 +28,6 @@
namespace Sci {
-#ifdef DISABLE_VALIDATIONS
-
-#define sane_nodep(a, b) 1
-#define sane_listp(a, b) 1
-
-#else
-
static int sane_nodep(EngineState *s, reg_t addr) {
int have_prev = 0;
reg_t prev = addr;
@@ -89,7 +82,6 @@ int sane_listp(EngineState *s, reg_t addr) {
return 1; // Empty list is fine
}
-#endif
reg_t kNewList(EngineState *s, int argc, reg_t *argv) {
reg_t listbase;