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

DREAMWEB: Make frame fixups more specific and add sanity checks

Browse source 
This should detect (and trigger asserts on) the kind of ex frame
data corruption in bug #3591088.
This commit is contained in:
Willem Jan Palenstijn 2012-11-30 16:10:18 +01:00
parent f5dbd23bab
commit f2fe1b775a
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
engines/dreamweb/object.cpp
View file

@ -435,10 +435,23 @@ void DreamWebEngine::deleteExFrame(uint8 frameNum) {
_vars._exFramePos -= frameSize;
// Adjust all frame pointers pointing into the shifted data
for (unsigned int i = 0; i < 3*kNumexobjects; ++i) {
frame = &_exFrames._frames[i];
if (frame->ptr() >= startOff)
frame->setPtr(frame->ptr() - frameSize);
for (unsigned int i = 0; i < kNumexobjects; ++i) {
if (_exData[i].mapad[0] != 0xff) {
frame = &_exFrames._frames[3*i+0];
if (frame->ptr() >= startOff) {
frame->setPtr(frame->ptr() - frameSize);
assert(frame->ptr() + frame->width*frame->height <= _vars._exFramePos);
} else {
assert(frame->ptr() + frame->width*frame->height <= startOff);
}
frame = &_exFrames._frames[3*i+1];
if (frame->ptr() >= startOff) {
frame->setPtr(frame->ptr() - frameSize);
assert(frame->ptr() + frame->width*frame->height <= _vars._exFramePos);
} else {
assert(frame->ptr() + frame->width*frame->height <= startOff);
}
}
}
}