[Scummvm-git-logs] scummvm master -> 8c4b448d31ca10d7cb46a238fe9882c0531f01e0

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8c4b448d31 STARTREK: Fix Accesses to Uninitialized Variable.


Commit: 8c4b448d31ca10d7cb46a238fe9882c0531f01e0
    https://github.com/scummvm/scummvm/commit/8c4b448d31ca10d7cb46a238fe9882c0531f01e0
Author: D G Turner (digitall at scummvm.org)
Date: 2018-08-09T19:35:14+01:00

Commit Message:
STARTREK: Fix Accesses to Uninitialized Variable.

Changed paths:
    engines/startrek/actors.cpp


diff --git a/engines/startrek/actors.cpp b/engines/startrek/actors.cpp
index 9f16f0f..aef7a7b 100644
--- a/engines/startrek/actors.cpp
+++ b/engines/startrek/actors.cpp
@@ -41,23 +41,24 @@ void StarTrekEngine::initActors() {
 int StarTrekEngine::loadActorAnim(int actorIndex, const Common::String &animName, int16 x, int16 y, Fixed8 scale) {
 	debugC(6, kDebugGraphics, "Load animation '%s' on actor %d", animName.c_str(), actorIndex);
 
-	Actor *actor;
+	Actor *actor = nullptr;
 
 	if (actorIndex == -1) {
 		// TODO
 		warning("loadActorAnim: actor == -1");
-	} else
+	} else {
 		actor = &_actorList[actorIndex];
 
-	if (actor->spriteDrawn) {
-		releaseAnim(actor);
-		drawActorToScreen(actor, animName, x, y, scale, false);
-	} else {
-		drawActorToScreen(actor, animName, x, y, scale, true);
-	}
+		if (actor->spriteDrawn) {
+			releaseAnim(actor);
+			drawActorToScreen(actor, animName, x, y, scale, false);
+		} else {
+			drawActorToScreen(actor, animName, x, y, scale, true);
+		}
 
-	actor->triggerActionWhenAnimFinished = false;
-	actor->finishedAnimActionParam = 0;
+		actor->triggerActionWhenAnimFinished = false;
+		actor->finishedAnimActionParam = 0;
+	}
 
 	return actorIndex;
 }