[Scummvm-cvs-logs] SF.net SVN: scummvm:[38918] scummvm/trunk/engines/sci/engine/vm.cpp

wjpalenstijn at users.sourceforge.net wjpalenstijn at users.sourceforge.net
Fri Feb 27 00:13:01 CET 2009


Revision: 38918
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38918&view=rev
Author:   wjpalenstijn
Date:     2009-02-26 23:13:00 +0000 (Thu, 26 Feb 2009)

Log Message:
-----------
Reset successor variable after use.
This fixes a crash in SQ3 after reloading followed by restarting.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/vm.cpp

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2009-02-26 23:04:50 UTC (rev 38917)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2009-02-26 23:13:00 UTC (rev 38918)
@@ -2023,6 +2023,7 @@
 		s->execution_stack_pos_changed = 0;
 		run_vm(s, (successor || restoring) ? 1 : 0);
 		if (s->restarting_flags & SCI_GAME_IS_RESTARTING_NOW) { // Restart was requested?
+			successor = NULL;
 			free(s->execution_stack);
 			s->execution_stack = NULL;
 			s->execution_stack_pos = -1;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list