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

SCI: Fix potential dangling pointer more robustly,

Browse source 
by changing the executionStack implementation to a list.

svn-id: r40971
This commit is contained in:
Willem Jan Palenstijn 2009-05-28 22:42:18 +00:00
parent d25ddb5fa9
commit 67fa1fb59c
7 changed files with 41 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/sci/engine/kmisc.cpp
View file

@ -37,7 +37,9 @@ namespace Sci {
reg_t kRestartGame(EngineState *s, int funct_nr, int argc, reg_t *argv) {
s->restarting_flags |= SCI_GAME_IS_RESTARTING_NOW;
s->restarting_flags &= ~SCI_GAME_WAS_RESTARTED_AT_LEAST_ONCE; // This appears to help
s->_executionStack.resize(s->execution_stack_base + 1);
shrink_execution_stack(s, s->execution_stack_base + 1);
script_abort_flag = 1; // Force vm to abort ASAP
return NULL_REG;
}