[Scummvm-cvs-logs] scummvm master -> 0a93ef16a01555a18287b88ee188aabfa251de28

[eriktorbjorn]

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:
0a93ef16a0 SHERLOCK: Fix out-of-bounds access of JOURNAL_COMMAND (CID 1308104)


Commit: 0a93ef16a01555a18287b88ee188aabfa251de28
    https://github.com/scummvm/scummvm/commit/0a93ef16a01555a18287b88ee188aabfa251de28
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-06-30T06:16:10+02:00

Commit Message:
SHERLOCK: Fix out-of-bounds access of JOURNAL_COMMAND (CID 1308104)

Maybe we should be using ARRAYSIZE() instead, though.

Changed paths:
    engines/sherlock/tattoo/tattoo_journal.cpp



diff --git a/engines/sherlock/tattoo/tattoo_journal.cpp b/engines/sherlock/tattoo/tattoo_journal.cpp
index ac8d9cd..c4022e9 100644
--- a/engines/sherlock/tattoo/tattoo_journal.cpp
+++ b/engines/sherlock/tattoo/tattoo_journal.cpp
@@ -701,7 +701,7 @@ void TattooJournal::disableControls() {
 
 	// Print the Journal commands
 	int xp = r.left + r.width() / 6;
-	for (int idx = 0; idx < 3; ++idx) {
+	for (int idx = 0; idx < 2; ++idx) {
 		screen.gPrint(Common::Point(xp - screen.stringWidth(JOURNAL_COMMANDS[idx]) / 2, r.top + 5),
 			INFO_BOTTOM, "%s", JOURNAL_COMMANDS[idx]);