[Scummvm-git-logs] scummvm master -> 2df604cf0f2aa9164a03391a5533d01f0b1c872c

[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:
2df604cf0f DIRECTOR: LINGO: Do not read past buffer in preprocessor


Commit: 2df604cf0f2aa9164a03391a5533d01f0b1c872c
    https://github.com/scummvm/scummvm/commit/2df604cf0f2aa9164a03391a5533d01f0b1c872c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-21T01:08:43+01:00

Commit Message:
DIRECTOR: LINGO: Do not read past buffer in preprocessor

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


diff --git a/engines/director/lingo/lingo-preprocessor.cpp b/engines/director/lingo/lingo-preprocessor.cpp
index 6b81cab..8e251b4 100644
--- a/engines/director/lingo/lingo-preprocessor.cpp
+++ b/engines/director/lingo/lingo-preprocessor.cpp
@@ -56,7 +56,11 @@ static Common::String prevtok(const char *s, const char *lineStart, const char *
 
 	// Scan first non-whitespace
 	while (s >= lineStart && (*s == ' ' || *s == '\t')) // If we see a whitespace
-		s--;
+		if (s > lineStart) {
+			s--;
+		} else {
+			break;
+		}
 
 	// Now copy everything till whitespace
 	if (Common::isAlnum(*s)) {