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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/01/11 14:53:02

Modified files:
        .              : ChangeLog 
        server         : as_environment.cpp 

Log message:
                * server/as_environment.cpp (get_variable): use 'with' stack 
when
                  finding path component of a path.to.variable (seems to fix
                  a use case in player2.swf).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2085&r2=1.2086
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.49&r2=1.50

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2085
retrieving revision 1.2086
diff -u -b -r1.2085 -r1.2086
--- ChangeLog   11 Jan 2007 14:01:10 -0000      1.2085
+++ ChangeLog   11 Jan 2007 14:53:02 -0000      1.2086
@@ -1,5 +1,8 @@
 2007-01-11 Sandro Santilli <address@hidden>
 
+       * server/as_environment.cpp (get_variable): use 'with' stack when
+         finding path component of a path.to.variable (seems to fix
+         a use case in player2.swf).
        * server/styles.cpp: warn only once about 1st gradient fill
          style position != 0. Use log_swferror when appropriate.
 

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- server/as_environment.cpp   2 Jan 2007 15:55:46 -0000       1.49
+++ server/as_environment.cpp   11 Jan 2007 14:53:02 -0000      1.50
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: as_environment.cpp,v 1.49 2007/01/02 15:55:46 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.50 2007/01/11 14:53:02 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -44,12 +44,12 @@
                const ScopeStack& with_stack) const
 {
     // Path lookup rigamarole.
-    character* target = m_target;
     std::string        path;
     std::string        var;
     //log_msg("get_variable(%s)", varname.c_str());
     if (parse_path(varname, path, var)) {
-       target = find_target(path);     // @@ Use with_stack here too???  Need 
to test.
+       as_value target_val = get_variable_raw(path, with_stack);
+        as_object* target = target_val.to_object();
        if (target) {
            as_value    val;
            target->get_member(var.c_str(), &val);
@@ -59,7 +59,7 @@
            return as_value();
        }
     } else {
-       return this->get_variable_raw(varname, with_stack);
+       return get_variable_raw(varname, with_stack);
     }
 }