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

[Zou Lunkai]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Zou Lunkai <zoulunkai>  07/10/12 08:01:10

Modified files:
        .              : ChangeLog 
        server         : swf_function.cpp 

Log message:
        revert my last commit, it trigger some failures within current 
testsuite.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4599&r2=1.4600
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_function.cpp?cvsroot=gnash&r1=1.38&r2=1.39

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4599
retrieving revision 1.4600
diff -u -b -r1.4599 -r1.4600
--- ChangeLog   12 Oct 2007 07:51:30 -0000      1.4599
+++ ChangeLog   12 Oct 2007 08:01:10 -0000      1.4600
@@ -1,10 +1,5 @@
 2007-10-12 Zou Lunkai <address@hidden>
 
-       * server/swf_function.cpp: use the caller's environment when the 
original 
-         target is destroyed.
-
-2007-10-12 Zou Lunkai <address@hidden>
-
        * testsuite/misc-swfc.all/opcode_guard_test2.sc: test that both 
setTarget
          and setTargetExpression use the target string instead of pointer for
          searching the target.

Index: server/swf_function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf_function.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/swf_function.cpp     12 Oct 2007 07:51:30 -0000      1.38
+++ server/swf_function.cpp     12 Oct 2007 08:01:10 -0000      1.39
@@ -168,10 +168,9 @@
 
        as_environment* our_env = m_env;
        assert(our_env);
-       if(our_env->get_original_target()->isDestroyed())
+       // if(our_env->get_original_target()->isDestroyed())
+    if (our_env == NULL)
        {
-               // if the original target is destroyed, we use the caller's 
environment.
-               // TODO: fix leaks here.
                our_env = &fn.env();
        }
        //our_env = &fn.env(); // I think this should be it...