[Gnash-commit] gnash ChangeLog server/as_environment.cpp tests...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/01/11 23:17:49

Modified files:
        .              : ChangeLog 
        server         : as_environment.cpp 
        testsuite/actionscript.all: getvariable.as 

Log message:
                * server/as_environment.cpp (get_variable_raw): accept
                  slashes in variable names (see getvariable.as).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2089&r2=1.2090
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/getvariable.as?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2089
retrieving revision 1.2090
diff -u -b -r1.2089 -r1.2090
--- ChangeLog   11 Jan 2007 22:53:59 -0000      1.2089
+++ ChangeLog   11 Jan 2007 23:17:48 -0000      1.2090
@@ -1,5 +1,7 @@
 2007-01-11 Sandro Santilli <address@hidden>
 
+       * server/as_environment.cpp (get_variable_raw): accept
+         slashes in variable names (see getvariable.as).
        * testsuite/actionscript.all/: Makefile.am, getvariable.as
          New testcase for GetVariable action type. Gnash aborts
          against it. 

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- server/as_environment.cpp   11 Jan 2007 21:29:58 -0000      1.51
+++ server/as_environment.cpp   11 Jan 2007 23:17:48 -0000      1.52
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: as_environment.cpp,v 1.51 2007/01/11 21:29:58 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.52 2007/01/11 23:17:48 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -80,7 +80,8 @@
     // varname must be a plain variable name; no path parsing.
 {
     assert(strchr(varname.c_str(), ':') == NULL);
-    assert(strchr(varname.c_str(), '/') == NULL);
+    //let's allow slashes in variable names, if SWF has them..
+    //assert(strchr(varname.c_str(), '/') == NULL);
     assert(strchr(varname.c_str(), '.') == NULL);
 
     as_value   val;

Index: testsuite/actionscript.all/getvariable.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/getvariable.as,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/actionscript.all/getvariable.as   11 Jan 2007 23:09:30 -0000      
1.2
+++ testsuite/actionscript.all/getvariable.as   11 Jan 2007 23:17:48 -0000      
1.3
@@ -19,7 +19,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: getvariable.as,v 1.2 2007/01/11 23:09:30 strk Exp $";
+rcsid="$Id: getvariable.as,v 1.3 2007/01/11 23:17:48 strk Exp $";
 
 #include "check.as"
 
@@ -51,7 +51,7 @@
        getvariable
         setvariable
 };
-check_equals(checkpoint, undefined);
+xcheck_equals(checkpoint, undefined);
 
 //---------------------------------------------------------------------
 // Check '../invalidname' access 
@@ -67,7 +67,7 @@
        getvariable
         setvariable
 };
-check_equals(checkpoint, undefined);
+xcheck_equals(checkpoint, undefined);
 
 //---------------------------------------------------------------------
 // Check 'obj.member' access 
@@ -93,7 +93,7 @@
        getvariable
         setvariable
 };
-check_equals(objmemb, 3);
+xcheck_equals(objmemb, 3);
 
 //-----------------------------------------------------------------------
 // Check 'invalid/name' access