[Scummvm-cvs-logs] scummvm master -> e9ae9ff4e7da6b525159792172d0e0f4cd3c6123

[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:
e9ae9ff4e7 SHERLOCK: RT: Fix array overrun when displaying journal


Commit: e9ae9ff4e7da6b525159792172d0e0f4cd3c6123
    https://github.com/scummvm/scummvm/commit/e9ae9ff4e7da6b525159792172d0e0f4cd3c6123
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-09-11T20:15:00-04:00

Commit Message:
SHERLOCK: RT: Fix array overrun when displaying journal

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



diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index 160b1ca..6ed0bf6 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -216,9 +216,9 @@ void TattooUserInterface::doJournal() {
 	TattooJournal &journal = *(TattooJournal *)_vm->_journal;
 	TattooScene &scene = *(TattooScene *)_vm->_scene;
 	Screen &screen = *_vm->_screen;
-	byte lookupTable[PALETTE_SIZE];
+	byte lookupTable[PALETTE_COUNT];
 
-	Common::copy(&_lookupTable[0], &_lookupTable[PALETTE_SIZE], &lookupTable[0]);
+	Common::copy(&_lookupTable[0], &_lookupTable[PALETTE_COUNT], &lookupTable[0]);
 	_menuMode = JOURNAL_MODE;
 	journal.show();
 
@@ -229,7 +229,7 @@ void TattooUserInterface::doJournal() {
 	// Restore the the old screen palette and greyscale lookup table
 	screen.clear();
 	screen.setPalette(screen._cMap);
-	Common::copy(&lookupTable[0], &lookupTable[PALETTE_SIZE], &_lookupTable[0]);
+	Common::copy(&lookupTable[0], &lookupTable[PALETTE_COUNT], &_lookupTable[0]);
 
 	// Restore the scene
 	screen._backBuffer1.blitFrom(screen._backBuffer2);