[Scummvm-cvs-logs] scummvm master -> 6aa5566a0f67a033ff02ae47a4c21aa3edc3c3ec

[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:
6aa5566a0f SHERLOCK: SS: Fix German conversation crash


Commit: 6aa5566a0f67a033ff02ae47a4c21aa3edc3c3ec
    https://github.com/scummvm/scummvm/commit/6aa5566a0f67a033ff02ae47a4c21aa3edc3c3ec
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-10-05T22:19:46-04:00

Commit Message:
SHERLOCK: SS: Fix German conversation crash

The crash occurred due to the presense of a single character
printable string between two script opcodes

Changed paths:
    engines/sherlock/journal.cpp



diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index e442a3c..44b966f 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -485,9 +485,9 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 				// Copy text from the place until either the reply ends, a comment
 				// {} block is started, or a control character is encountered
 				journalString += c;
-				do {
+				while (*replyP && *replyP < opcodes[0] && *replyP != '{' && *replyP != '}') {
 					journalString += *replyP++;
-				} while (*replyP && *replyP < opcodes[0] && *replyP != '{' && *replyP != '}');
+				}
 
 				commentJustPrinted = false;
 			}