libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-25 05:34:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
svn-id: r44524
This commit is contained in:
Scott Thomas 2009-10-01 15:58:15 +00:00
parent 6697f46922
commit 2fa7fbc1a5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/groovie/script.cpp
View File

@ -264,11 +264,15 @@ uint8 Script::readScriptVar() {
}
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() {