[Gnash-commit] gnash ChangeLog server/vm/ActionExec.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/10 14:24:57

Modified files:
        .              : ChangeLog 
        server/vm      : ActionExec.cpp 

Log message:
                * server/vm/ActionExec.cpp (cleanupAfterRun): don't assume the 
call
                  stack should be empty at the end of global code execution. 
Still
                  print an error as we need further investigation about it. 
Fixes
                  bug #20740.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3984&r2=1.3985
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.39&r2=1.40

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3984
retrieving revision 1.3985
diff -u -b -r1.3984 -r1.3985
--- ChangeLog   10 Aug 2007 14:06:34 -0000      1.3984
+++ ChangeLog   10 Aug 2007 14:24:56 -0000      1.3985
@@ -1,3 +1,10 @@
+2007-08-10 Sandro Santilli <address@hidden>
+
+       * server/vm/ActionExec.cpp (cleanupAfterRun): don't assume the call
+         stack should be empty at the end of global code execution. Still
+         print an error as we need further investigation about it. Fixes
+         bug #20740.
+
 2007-08-10 Paul Smedley <address@hidden>
 
        * libbase/URL.cpp, libbase/container.h, libbase/network.cpp,

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- server/vm/ActionExec.cpp    1 Jul 2007 10:54:36 -0000       1.39
+++ server/vm/ActionExec.cpp    10 Aug 2007 14:24:57 -0000      1.40
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ActionExec.cpp,v 1.39 2007/07/01 10:54:36 bjacques Exp $ */
+/* $Id: ActionExec.cpp,v 1.40 2007/08/10 14:24:57 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -288,7 +288,15 @@
     if ( ! isFunction() && env.callStackDepth() > 0 )
     {
        log_error(_("Call stack non-empty at end of ExecutableCode run (limits 
hit?)"));
-       env.clearCallFrames();
+       // TOOD:
+       // bug #20740 contains a movie that fails an assertion if we clean the 
call stack here
+       // maybe global code was executed as effect of a function code (think 
gotoFrame, attachMovie ?)
+       // We'll keep the verbose error for now, but let's not clean the call 
frame, shouldn't
+       // hurt anyway..
+       // A better implementation would likely be taking note of the 
callStackDepth at startup
+       // (like for _initial_stack_size) and check it here for consistency 
(and proper cleanup
+       // on limits hit).
+       //env.clearCallFrames();
     }
 
     // check if the stack was smashed