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

SCI: Avoid incrementing lockers of deleted script

Browse source 
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.
This commit is contained in:
Willem Jan Palenstijn 2011-05-13 23:01:02 +02:00
parent 3ed095434f
commit c01fed7159
3 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
engines/sci/engine/gc.cpp
View file

@ -87,14 +87,7 @@ static void processWorkList(SegManager *segMan, WorklistManager &wm, const Commo
wm._worklist.pop_back(); wm._worklist.pop_back();
if (reg.segment != stackSegment) { // No need to repeat this one if (reg.segment != stackSegment) { // No need to repeat this one
debugC(kDebugLevelGC, "[GC] Checking %04x:%04x", PRINT_REG(reg)); debugC(kDebugLevelGC, "[GC] Checking %04x:%04x", PRINT_REG(reg));
// WORKAROUND: We only check for valid offsets here. Fixes bugs if (reg.segment < heap.size() && heap[reg.segment]) {
// #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! // Valid heap object? Find its outgoing references!
wm.pushArray(heap[reg.segment]->listAllOutgoingReferences(reg)); wm.pushArray(heap[reg.segment]->listAllOutgoingReferences(reg));
} }

2
engines/sci/engine/kscripts.cpp
View file

@ -259,7 +259,7 @@ reg_t kDisposeScript(EngineState *s, int argc, reg_t *argv) {
SegmentId id = s->_segMan->getScriptSegment(script); SegmentId id = s->_segMan->getScriptSegment(script);
Script *scr = s->_segMan->getScriptIfLoaded(id); Script *scr = s->_segMan->getScriptIfLoaded(id);
if (scr) { if (scr && !scr->isMarkedAsDeleted()) {
if (s->_executionStack.back().addr.pc.segment != id) if (s->_executionStack.back().addr.pc.segment != id)
scr->setLockers(1); scr->setLockers(1);
} }

2
engines/sci/engine/script.cpp
View file

@ -380,6 +380,7 @@ void Script::relocateSci3(reg_t block) {
} }
void Script::incrementLockers() { void Script::incrementLockers() {
assert(!_markedAsDeleted);
_lockers++; _lockers++;
} }
@ -393,6 +394,7 @@ int Script::getLockers() const {
} }
void Script::setLockers(int lockers) { void Script::setLockers(int lockers) {
assert(lockers == 0 || !_markedAsDeleted);
_lockers = lockers; _lockers = lockers;
} }