diff options
| author | Filippos Karapetis | 2010-12-21 20:54:33 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-12-21 20:54:33 +0000 |
| commit | 7680ed0be7e6d726fd25ba06506cb7fe9e8ea2ca (patch) | |
| tree | 4f0186f3b2f1a010994cbb20538dcf89fe074de4 /engines | |
| parent | 372ede7904581c868d33b3cf0ec2490cbbd774d7 (diff) | |
| download | scummvm-rg350-7680ed0be7e6d726fd25ba06506cb7fe9e8ea2ca.tar.gz scummvm-rg350-7680ed0be7e6d726fd25ba06506cb7fe9e8ea2ca.tar.bz2 scummvm-rg350-7680ed0be7e6d726fd25ba06506cb7fe9e8ea2ca.zip | |
Added back the null check in kArray(cpy): it happens in SCI3
svn-id: r54990
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/klists.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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]); |