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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/01/15 14:46:24

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

Log message:
        Patch by Zou Lunkai <address@hidden>:
        
                * server/vm/ASHandlers.cpp (ActionDefineFunction,
                ActionDefineFunction2): don't push named function literals
                on the stack (do it only for anonymous functions).
                See patch #5685.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2108&r2=1.2109
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.29&r2=1.30

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2108
retrieving revision 1.2109
diff -u -b -r1.2108 -r1.2109
--- ChangeLog   15 Jan 2007 14:19:17 -0000      1.2108
+++ ChangeLog   15 Jan 2007 14:46:24 -0000      1.2109
@@ -1,3 +1,10 @@
+2007-01-15 Zou Lunkai <address@hidden>
+
+       * server/vm/ASHandlers.cpp (ActionDefineFunction,
+       ActionDefineFunction2): don't push named function literals
+       on the stack (do it only for anonymous functions).
+       See patch #5685.
+
 2007-01-15 Sandro Santilli <address@hidden>
 
        * testsuite/server/Makefile.am: explicitly link to libgnashvm.

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/vm/ASHandlers.cpp    15 Jan 2007 14:16:06 -0000      1.29
+++ server/vm/ASHandlers.cpp    15 Jan 2007 14:46:24 -0000      1.30
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: ASHandlers.cpp,v 1.29 2007/01/15 14:16:06 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.30 2007/01/15 14:46:24 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -3003,7 +3003,7 @@
        if ( thread.next_pc+code_size > actionbuf_size )
        {
                IF_VERBOSE_MALFORMED_SWF(
-                       log_warning("Malformed SWF: function2 code len (%u) "
+                       log_swferror("function2 code len (%u) "
                                "overflows DOACTION tag boundaries "
                                "(DOACTION tag len=%u, "
                                "function2 code offset=%u). "
@@ -3029,8 +3029,11 @@
                thread.setVariable(name, function_value);
        }
     
-       // Also leave it on the stack.
+       // Otherwise push the function literal on the stack
+       else
+       {
        env.push_val(function_value);
+       }
 }
 
 void
@@ -3159,8 +3162,11 @@
                thread.setVariable(name, function_value);
        }
     
-       // Also leave it on the stack.
+       // Otherwise push the function literal on the stack
+       else
+       {
        env.push_val(function_value);
+       }
 
        //cerr << "After ActionDefineFunction:"<<endl;
        //env.dump_stack();