[Scummvm-cvs-logs] SF.net SVN: scummvm:[44524] scummvm/trunk/engines/groovie/script.cpp

[scott_t at users.sourceforge.net]

Revision: 44524
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44524&view=rev
Author:   scott_t
Date:     2009-10-01 15:58:15 +0000 (Thu, 01 Oct 2009)

Log Message:
-----------
T7G: Proper fix for #2847539 - remove ambiguity in multi-byte script reads.

Modified Paths:
--------------
    scummvm/trunk/engines/groovie/script.cpp

Modified: scummvm/trunk/engines/groovie/script.cpp
===================================================================
--- scummvm/trunk/engines/groovie/script.cpp	2009-10-01 15:33:38 UTC (rev 44523)
+++ scummvm/trunk/engines/groovie/script.cpp	2009-10-01 15:58:15 UTC (rev 44524)
@@ -264,11 +264,15 @@
 }
 
 uint16 Script::readScript16bits() {
-	return readScript8bits() | (readScript8bits() << 8);
+	uint8 lower = readScript8bits();
+	uint8 upper = readScript8bits();
+	return lower | (upper << 8);
 }
 
 uint32 Script::readScript32bits() {
-	return readScript16bits() | (readScript16bits() << 16);
+	uint16 lower = readScript16bits();
+	uint16 upper = readScript16bits();
+	return lower | (upper << 16);
 }
 
 uint16 Script::readScript8or16bits() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.