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

[thebluegr at users.sourceforge.net]

Revision: 54990
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54990&view=rev
Author:   thebluegr
Date:     2010-12-21 20:54:33 +0000 (Tue, 21 Dec 2010)

Log Message:
-----------
Added back the null check in kArray(cpy): it happens in SCI3

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-12-21 18:16:37 UTC (rev 54989)
+++ scummvm/trunk/engines/sci/engine/klists.cpp	2010-12-21 20:54:33 UTC (rev 54990)
@@ -702,12 +702,11 @@
 		return argv[1];
 	}
 	case 6: { // Cpy
-#if 0
 		if (argv[1].isNull() || argv[3].isNull()) {
+			// Happens in SCI3
 			warning("kArray(Cpy): Request to copy from or to a null pointer");
 			return NULL_REG;
 		}
-#endif
 
 		reg_t arrayHandle = argv[1];
 		SciArray<reg_t> *array1 = s->_segMan->lookupArray(argv[1]);


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