From 559e6dafe1ea9c57dddca65d8e16e94ba88a4c40 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 18 Jul 2017 22:44:55 -0400 Subject: TITANIC: Fix access after free in filterConcepts loop --- engines/titanic/true_talk/tt_parser.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/engines/titanic/true_talk/tt_parser.cpp b/engines/titanic/true_talk/tt_parser.cpp index 2893c50a8d..adf008767f 100644 --- a/engines/titanic/true_talk/tt_parser.cpp +++ b/engines/titanic/true_talk/tt_parser.cpp @@ -1609,7 +1609,9 @@ bool TTparser::checkConcept2(TTconcept *concept, int conceptMode) { int TTparser::filterConcepts(int conceptMode, int conceptIndex) { int result = 0; - for (TTconcept *currP = _conceptP; currP && !result; currP = currP->_nextP) { + for (TTconcept *nextP, *currP = _conceptP; currP && !result; currP = nextP) { + nextP = currP->_nextP; + if (checkConcept2(currP, conceptMode)) { TTconcept **ptrPP = _sentenceConcept->setConcept(conceptIndex, currP); TTconcept *newConcept = new TTconcept(*currP); -- cgit v1.2.3