[Scummvm-git-logs] scummvm master -> 968e34e6956932da7b25f8b4b62a616919e385ce

[sev-]

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:
968e34e695 DIRECTOR: LINGO: Readded sanity check to getting script contexts


Commit: 968e34e6956932da7b25f8b4b62a616919e385ce
    https://github.com/scummvm/scummvm/commit/968e34e6956932da7b25f8b4b62a616919e385ce
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-22T11:23:36+01:00

Commit Message:
DIRECTOR: LINGO: Readded sanity check to getting script contexts

Changed paths:
    engines/director/lingo/lingo.cpp


diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index d41bfac..423716a 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -91,9 +91,11 @@ Lingo::~Lingo() {
 }
 
 ScriptContext *Lingo::getScriptContext(ScriptType type, uint16 id) {
-	if (!_archives[_archiveIndex].scriptContexts[type].contains(id)) {
+	if (type > ARRAYSIZE(_archives[_archiveIndex].scriptContexts) ||
+			!_archives[_archiveIndex].scriptContexts[type].contains(id)) {
 		return NULL;
 	}
+
 	return _archives[_archiveIndex].scriptContexts[type][id];
 }