From 7680ed0be7e6d726fd25ba06506cb7fe9e8ea2ca Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 21 Dec 2010 20:54:33 +0000
Subject: Added back the null check in kArray(cpy): it happens in SCI3

svn-id: r54990
---
 engines/sci/engine/klists.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/engine/klists.cpp b/engines/sci/engine/klists.cpp
index f1b7195b36..50ac998afa 100644
--- a/engines/sci/engine/klists.cpp
+++ b/engines/sci/engine/klists.cpp
@@ -702,12 +702,11 @@ reg_t kArray(EngineState *s, int argc, reg_t *argv) {
 		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]);
-- 
cgit v1.2.3