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

[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:
f1db69d422 TITANIC: Fix crash in setConcept when src is null


Commit: f1db69d422ed93324633808763e8dbe8f09e5380
    https://github.com/scummvm/scummvm/commit/f1db69d422ed93324633808763e8dbe8f09e5380
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-13T16:07:16-05:00

Commit Message:
TITANIC: Fix crash in setConcept when src is null

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



diff --git a/engines/titanic/true_talk/tt_concept_node.cpp b/engines/titanic/true_talk/tt_concept_node.cpp
index f6512b3..ccba1b8 100644
--- a/engines/titanic/true_talk/tt_concept_node.cpp
+++ b/engines/titanic/true_talk/tt_concept_node.cpp
@@ -86,32 +86,34 @@ TTconcept **TTconceptNode::setConcept(int conceptIndex, TTconcept *src) {
 		break;
 	}
 
-	bool isPronoun = false;
-	StringArray &pronouns = g_vm->_scriptHandler->_parser._pronouns;
-	for (uint idx = 0; idx < pronouns.size() && !isPronoun; ++idx) {
-		isPronoun = pronouns[idx] == src->getText();
-	}
+	if (src) {
+		bool isPronoun = false;
+		StringArray &pronouns = g_vm->_scriptHandler->_parser._pronouns;
+		for (uint idx = 0; idx < pronouns.size() && !isPronoun; ++idx) {
+			isPronoun = pronouns[idx] == src->getText();
+		}
 
-	CScriptHandler &scrHandler = *g_vm->_exeResources._owner;
-	if (!isPronoun) {
-		switch (conceptIndex) {
-		case 0:
-			delete scrHandler._concept2P;
-			scrHandler._concept2P = new TTconcept(*src);
-			break;
-
-		case 1:
-			delete scrHandler._concept4P;
-			scrHandler._concept4P = new TTconcept(*src);
-			break;
-
-		case 2:
-			delete scrHandler._concept1P;
-			scrHandler._concept1P = new TTconcept(*src);
-			break;
-
-		default:
-			break;
+		CScriptHandler &scrHandler = *g_vm->_exeResources._owner;
+		if (!isPronoun) {
+			switch (conceptIndex) {
+			case 0:
+				delete scrHandler._concept2P;
+				scrHandler._concept2P = new TTconcept(*src);
+				break;
+
+			case 1:
+				delete scrHandler._concept4P;
+				scrHandler._concept4P = new TTconcept(*src);
+				break;
+
+			case 2:
+				delete scrHandler._concept1P;
+				scrHandler._concept1P = new TTconcept(*src);
+				break;
+
+			default:
+				break;
+			}
 		}
 	}