diff options
| author | agent-q | 2011-05-21 16:01:26 +0100 |
|---|---|---|
| committer | agent-q | 2011-05-21 16:01:26 +0100 |
| commit | 92d0216db18c96c97bb4b57ada76cf532838cf5b (patch) | |
| tree | 6d405ce821d055403a10aa347e8ae2826917bba1 /engines/sci/engine/gc.cpp | |
| parent | 4076a0466d67d42f093e3e73a30ea48e1e1d59e9 (diff) | |
| parent | dd6b5698b181532b37cba41b1475b01813aadddc (diff) | |
| download | scummvm-rg350-92d0216db18c96c97bb4b57ada76cf532838cf5b.tar.gz scummvm-rg350-92d0216db18c96c97bb4b57ada76cf532838cf5b.tar.bz2 scummvm-rg350-92d0216db18c96c97bb4b57ada76cf532838cf5b.zip | |
Merge branch 'branch-1-3-0' of https://github.com/scummvm/scummvm into branch-1-3-0
Diffstat (limited to 'engines/sci/engine/gc.cpp')
| -rw-r--r-- | engines/sci/engine/gc.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/engines/sci/engine/gc.cpp b/engines/sci/engine/gc.cpp index b1d461c561..e395eeab94 100644 --- a/engines/sci/engine/gc.cpp +++ b/engines/sci/engine/gc.cpp @@ -90,14 +90,7 @@ 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)); - // 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)) { + if (reg.segment < heap.size() && heap[reg.segment]) { // Valid heap object? Find its outgoing references! wm.pushArray(heap[reg.segment]->listAllOutgoingReferences(reg)); } |