[Scummvm-cvs-logs] SF.net SVN: scummvm:[46956] scummvm/trunk/engines/sci/engine/klists.cpp

[thebluegr at users.sourceforge.net]

Revision: 46956
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46956&view=rev
Author:   thebluegr
Date:     2010-01-03 21:53:34 +0000 (Sun, 03 Jan 2010)

Log Message:
-----------
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)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/klists.cpp

Modified: scummvm/trunk/engines/sci/engine/klists.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/klists.cpp	2010-01-03 21:51:30 UTC (rev 46955)
+++ scummvm/trunk/engines/sci/engine/klists.cpp	2010-01-03 21:53:34 UTC (rev 46956)
@@ -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 @@
 
 	return 1; // Empty list is fine
 }
-#endif
 
 reg_t kNewList(EngineState *s, int argc, reg_t *argv) {
 	reg_t listbase;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.