thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: fixing valgrind issue in Script::initialiseClasses thx to wjp for valgrind testing

Browse source 
svn-id: r50446
This commit is contained in:
Martin Kiewitz 2010-06-28 14:46:28 +00:00
parent 6402d64419
commit 66fb9e7a90
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
engines/sci/engine/script.cpp
View file

@ -410,12 +410,14 @@ void Script::initialiseClasses(SegManager *segMan) {
if (!seeker)
return;
uint16 marker;
bool isClass;
uint16 classpos = seeker - _buf;
int16 species = 0;
while (true) {
// In SCI0-SCI1, this is the segment type. In SCI11, it's a marker (0x1234)
uint16 marker = READ_SCI11ENDIAN_UINT16(seeker);
bool isClass;
uint16 classpos = seeker - _buf;
int16 species;
marker = READ_SCI11ENDIAN_UINT16(seeker);
if (!marker)
break;
@ -425,7 +427,8 @@ void Script::initialiseClasses(SegManager *segMan) {
species = READ_SCI11ENDIAN_UINT16(seeker + 10);
} else {
isClass = (marker == SCI_OBJ_CLASS);
species = READ_SCI11ENDIAN_UINT16(seeker + 12);
if (isClass)
species = READ_SCI11ENDIAN_UINT16(seeker + 12);
classpos += 12;
}