aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2013-11-10 12:58:05 +0100
committerJohannes Schickel2013-11-10 12:58:05 +0100
commitaf3059c114303950db592f75e38f0f83b0048b8a (patch)
treebf2ad3157d77ccd80aa99370c9c9d02ea6d4f815
parent5b1557adbf3525256de2fbc1daa92ac69ffc9410 (diff)
downloadscummvm-rg350-af3059c114303950db592f75e38f0f83b0048b8a.tar.gz
scummvm-rg350-af3059c114303950db592f75e38f0f83b0048b8a.tar.bz2
scummvm-rg350-af3059c114303950db592f75e38f0f83b0048b8a.zip
KYRA: Properly check parameters in CharacterGenerator::start.
Discoverd by CID #1003816.
-rw-r--r--engines/kyra/chargen.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 80a95da047..80ff42e2c5 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -155,8 +155,10 @@ CharacterGenerator::~CharacterGenerator() {
}
bool CharacterGenerator::start(EoBCharacter *characters, uint8 ***faceShapes) {
- if (!characters && !faceShapes)
+ if (!characters || !faceShapes) {
+ warning("CharacterGenerator::start: Called without character data");
return true;
+ }
_characters = characters;
_faceShapes = *faceShapes;