aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorathrxx2013-04-17 21:11:55 +0200
committerathrxx2013-04-18 16:10:46 +0200
commit9b74a7bd65668a75db75ef36fb10976d49fde02d (patch)
tree20306e507494c07993719a4504911a2f60a7ada1 /engines/kyra
parentd2d2ed1303e2214cb1c3879641ad64b6bec68fea (diff)
downloadscummvm-rg350-9b74a7bd65668a75db75ef36fb10976d49fde02d.tar.gz
scummvm-rg350-9b74a7bd65668a75db75ef36fb10976d49fde02d.tar.bz2
scummvm-rg350-9b74a7bd65668a75db75ef36fb10976d49fde02d.zip
KYRA: (LOL) - fix possible null ptr dereference in scene_lol.cpp
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/scene_lol.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp
index f1045d2ddf..c8618bc3bb 100644
--- a/engines/kyra/scene_lol.cpp
+++ b/engines/kyra/scene_lol.cpp
@@ -315,7 +315,7 @@ void LoLEngine::loadLevelGraphics(const char *file, int specialColor, int weight
if (_lastSpecialColor == 1)
_lastSpecialColor = 0x44;
else if (_lastSpecialColor == 0x66)
- _lastSpecialColor = scumm_stricmp(file, "YVEL2") ? 0xCC : 0x44;
+ _lastSpecialColor = file ? (scumm_stricmp(file, "YVEL2") ? 0xCC : 0x44) : 0x44;
else if (_lastSpecialColor == 0x6B)
_lastSpecialColor = 0xCC;
else