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

SCUMM: Avoid potential issues casting invalid values to enum

Browse source 
A compiler could in principle decide that a ResType enum can
never equal 0xFF or 0xFFFF, and thus incorrectly optimize
the ScummEngine::saveOrLoad code. So check the value
*before* casting it.
This commit is contained in:
Max Horn 2014-03-30 19:48:08 +02:00
parent 4d02f67bd1
commit 8638b29b89
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/scumm/saveload.cpp
View file

@ -1242,7 +1242,9 @@ void ScummEngine::saveOrLoad(Serializer *s) {
} }
s->saveUint16(0xFFFF); // End marker s->saveUint16(0xFFFF); // End marker
} else { } else {
while ((int)(type = (ResType)s->loadUint16()) != 0xFFFF) { uint16 tmp;
while ((tmp = s->loadUint16()) != 0xFFFF) {
type = (ResType)tmp;
while ((idx = s->loadUint16()) != 0xFFFF) { while ((idx = s->loadUint16()) != 0xFFFF) {
assert(idx < _res->_types[type].size()); assert(idx < _res->_types[type].size());
loadResource(s, type, idx); loadResource(s, type, idx);
@ -1430,7 +1432,9 @@ void ScummEngine::saveOrLoad(Serializer *s) {
} }
s->saveByte(0xFF); s->saveByte(0xFF);
} else { } else {
while ((int)(type = (ResType)s->loadByte()) != 0xFF) { uint8 tmp;
while ((tmp = s->loadByte()) != 0xFF) {
type = (ResType)tmp;
idx = s->loadUint16(); idx = s->loadUint16();
_res->lock(type, idx); _res->lock(type, idx);
} }