[Scummvm-git-logs] scummvm master -> e6c15b8f4d3d02c8b071ca389f5e0a0c4fbc17db

[dreammaster]

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:
e6c15b8f4d TITANIC: Fix crash in TTparser::processModifiers


Commit: e6c15b8f4d3d02c8b071ca389f5e0a0c4fbc17db
    https://github.com/scummvm/scummvm/commit/e6c15b8f4d3d02c8b071ca389f5e0a0c4fbc17db
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-06T14:36:45-05:00

Commit Message:
TITANIC: Fix crash in TTparser::processModifiers

Changed paths:
    engines/titanic/true_talk/tt_parser.cpp



diff --git a/engines/titanic/true_talk/tt_parser.cpp b/engines/titanic/true_talk/tt_parser.cpp
index 23a5a91..28160a0 100644
--- a/engines/titanic/true_talk/tt_parser.cpp
+++ b/engines/titanic/true_talk/tt_parser.cpp
@@ -1634,7 +1634,7 @@ int TTparser::processModifiers(int modifier, TTword *word) {
 	TTconcept *newConcept = new TTconcept(word, ST_UNKNOWN_SCRIPT);
 
 	// Cycles through each word
-	for (TTword *currP = _currentWordP; currP != word; currP = _currentWordP) {
+	for (TTword *currP = _currentWordP; currP && currP != word; currP = _currentWordP) {
 		if ((modifier == 2 && currP->_wordClass == WC_ADJECTIVE) ||
 				(modifier == 1 && currP->_wordClass == WC_ADVERB)) {
 			newConcept->_string2 += ' ';