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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/03/02 17:35:29

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

Log message:
                * server/vm/ASHandlers.cpp (ActionVar):
                  Ignore local variable declarations in non-function
                  context, and make it an aserror.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2515&r2=1.2516
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.47&r2=1.48

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2515
retrieving revision 1.2516
diff -u -b -r1.2515 -r1.2516
--- ChangeLog   2 Mar 2007 16:17:13 -0000       1.2515
+++ ChangeLog   2 Mar 2007 17:35:28 -0000       1.2516
@@ -1,5 +1,8 @@
 2007-03-02 Sandro Santilli <address@hidden>
 
+       * server/vm/ASHandlers.cpp (ActionVar):
+         Ignore local variable declarations in non-function
+         context, and make it an aserror.
        * server/vm/ASHandlers.cpp (ActionNew): add missing
          premature return on malformed SWF.
        * server/debugger.{cpp,h}: proxy local variables and

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/vm/ASHandlers.cpp    2 Mar 2007 16:28:26 -0000       1.47
+++ server/vm/ASHandlers.cpp    2 Mar 2007 17:35:29 -0000       1.48
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.47 2007/03/02 16:28:26 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.48 2007/03/02 17:35:29 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2243,7 +2243,16 @@
     as_environment& env = thread.env;
     thread.ensureStack(1); // var name
     string varname = env.top(0).to_std_string();
+    if ( thread.isFunction() )
+    {
     env.declare_local(varname);
+    }
+    else
+    {
+       IF_VERBOSE_ASCODING_ERRORS(
+       log_aserror("The 'var whatever' syntax in timeline context is a 
no-op.");
+       );
+    }
     env.drop(1);
 }