libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 14:18:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Marked the sanity check inside processWorkList() as a workaround

Browse Source 
The sanity check added in rev #35086fe17c fixes the crashes with that
code when an invalid reference is about to be processed, but these
references shouldn't be in the stack at all in the first place, so the
root cause seems to be somewhere else.
This commit is contained in:
md5 2011-05-13 00:15:41 +03:00
parent a3c6439a1a
commit c9cef5e971
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/sci/engine/gc.cpp
View File

@ -87,7 +87,13 @@ static void processWorkList(SegManager *segMan, WorklistManager &wm, const Commo
wm._worklist.pop_back();
if (reg.segment != stackSegment) { // No need to repeat this one
debugC(kDebugLevelGC, "[GC] Checking %04x:%04x", PRINT_REG(reg));
// We only check for valid offsets here. Fixes bugs #3299458 and #3295849.
// WORKAROUND: We only check for valid offsets here. Fixes bugs
// #3299458 and #3295849.
// FIXME: Where are these invalid offsets coming from? The check
// below avoids a crash when examining invalid references, but the
// root of the problem lies elsewhere. These shouldn't be in the
// stack at all (unless these really are script bugs, in which case
// we should just keep the sanity check).
if (reg.segment < heap.size() && heap[reg.segment] && heap[reg.segment]->isValidOffset(reg.offset)) {
// Valid heap object? Find its outgoing references!
wm.pushArray(heap[reg.segment]->listAllOutgoingReferences(reg));