[Gnash-commit] /srv/bzr/gnash/avm2 r9555: Make find_prop_strict always search the global object.

[Tom Stellard]

------------------------------------------------------------
revno: 9555
committer: Tom Stellard <address@hidden>
branch nick: gnash_dev
timestamp: Thu 2008-09-11 23:57:55 +0800
message:
  Make find_prop_strict always search the global object.
modified:
  libcore/vm/Machine.cpp

=== modified file 'libcore/vm/Machine.cpp'
--- a/libcore/vm/Machine.cpp    2008-09-11 15:23:21 +0000
+++ b/libcore/vm/Machine.cpp    2008-09-11 15:57:55 +0000
@@ -2667,12 +2667,14 @@
 as_value Machine::find_prop_strict(asName multiname){
        
        as_value val;
+       mAsValueScopeStack.push(as_value(mGlobalObject));
        for(int i=0;i<mAsValueScopeStack.size();i++){
 
                val = 
mAsValueScopeStack.top(i).to_object().get()->getMember(multiname.getGlobalName(),multiname.getNamespace()->getURI());
 
                if(!val.is_undefined()){
                        push_stack(mAsValueScopeStack.top(i));
+                       mAsValueScopeStack.pop();
                        return val;
                }
        }
@@ -2685,6 +2687,7 @@
        std::string path = ns.size() == 0 ? name : ns + "." + name;
        val = env.get_variable(path,*getScopeStack(),&target);
        push_stack(as_value(target));
+       mAsValueScopeStack.pop();
        return val;
 }