diff options
| author | Willem Jan Palenstijn | 2011-05-13 23:01:02 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2011-05-13 23:09:04 +0200 |
| commit | c01fed7159c313680e55458efb6529d332ebc8b0 (patch) | |
| tree | 1b995f0f191e9e14200f1295ab3c78228ce3409b /engines/sci/engine/gc.cpp | |
| parent | 3ed095434f471d1cecde2f8c2c805f7d22aed572 (diff) | |
| download | scummvm-rg350-c01fed7159c313680e55458efb6529d332ebc8b0.tar.gz scummvm-rg350-c01fed7159c313680e55458efb6529d332ebc8b0.tar.bz2 scummvm-rg350-c01fed7159c313680e55458efb6529d332ebc8b0.zip | |
SCI: Avoid incrementing lockers of deleted script
Having a deleted script with non-zero lockers had the side effect of
making the deleted script re-appear in the GC's work list, including
any (deleted) objects in the script.
This should be the root cause of bugs #3299458 and #3295849, so
also delete the workaround added for that in 35086fe1.
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 b40677d4ed..2d71878bda 100644 --- a/engines/sci/engine/gc.cpp +++ b/engines/sci/engine/gc.cpp @@ -87,14 +87,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)); } |