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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/11/15 20:46:40

Modified files:
        .              : ChangeLog 
        server/vm      : ASHandlers.cpp 
        testsuite/swfdec: PASSING 

Log message:
        (ActionCastOp): swap order of arguments, return null on supposedly 
invalid call.
        Fixes cast-{5,6,7,8}.swf in swfdec testsuite.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4871&r2=1.4872
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.151&r2=1.152
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.60&r2=1.61

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4871
retrieving revision 1.4872
diff -u -b -r1.4871 -r1.4872
--- ChangeLog   15 Nov 2007 20:13:20 -0000      1.4871
+++ ChangeLog   15 Nov 2007 20:46:39 -0000      1.4872
@@ -1,5 +1,11 @@
 2007-11-15 Sandro Santilli <address@hidden>
 
+       * server/vm/ASHandlers.cpp (ActionCastOp): swap order of arguments,
+         return null on supposedly invalid call.
+       * testsuite/swfdec/PASSING: cast-{5,6,7,8}.swf succeed.
+
+2007-11-15 Sandro Santilli <address@hidden>
+
        * server/vm/ASHandlers.cpp (ActionDivide): return the string '#ERROR#'
          when a division by 0 is requested in SWF<5.
        * testsuite/swfdec/PASSING: crash-0.5.3-divide-by-zero.swf succeeds.

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -b -r1.151 -r1.152
--- server/vm/ASHandlers.cpp    15 Nov 2007 20:13:21 -0000      1.151
+++ server/vm/ASHandlers.cpp    15 Nov 2007 20:46:40 -0000      1.152
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.151 2007/11/15 20:13:21 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.152 2007/11/15 20:46:40 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1357,25 +1357,25 @@
 
        as_environment& env = thread.env;
 
-       thread.ensureStack(2);  // super, instance
-
-       // Get the "super" function
-       as_function* super = env.top(0).to_as_function();
+       thread.ensureStack(2);  // instance, super 
 
        // Get the "instance"
-       boost::intrusive_ptr<as_object> instance = env.top(1).to_object();
+       boost::intrusive_ptr<as_object> instance = env.top(0).to_object();
+
+       // Get the "super" function
+       as_function* super = env.top(1).to_as_function();
 
        // Invalid args!
        if (!super || ! instance)
        {
-               IF_VERBOSE_ACTION (
-               log_action(_("-- %s cast_to %s (invalid args?)"),
+               IF_VERBOSE_ASCODING_ERRORS (
+               log_aserror(_("-- %s cast_to %s (invalid args?)"),
                        env.top(1).to_debug_string().c_str(),
                        env.top(0).to_debug_string().c_str());
                );
 
                env.drop(1);
-               env.top(0) = as_value();
+               env.top(0).set_null(); // null, not undefined 
                return;
        }
 
@@ -1391,7 +1391,7 @@
                env.top(0).set_null(); // null, not undefined.
        }
 
-       log_msg(_("ActionCastOp TESTING"));
+       log_debug(_("ActionCastOp TESTING"));
 }
 
 void

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- testsuite/swfdec/PASSING    15 Nov 2007 20:13:21 -0000      1.60
+++ testsuite/swfdec/PASSING    15 Nov 2007 20:46:40 -0000      1.61
@@ -48,6 +48,10 @@
 callfunction-stack.swf:21d0c957f4caf0eb0ccd0dcadaf17500
 case1-6.swf:ba805f628a3a2d1bbd292ec1e56d1708
 case1-7.swf:ad4cfa4c3df86421237239167414fb40
+cast-5.swf:9b7fb2315d1ca5dbc7476ce29037bb19
+cast-6.swf:1777b4314b023cf1b3aed8133f932e6f
+cast-7.swf:7b72a050371d1f0c3b24ed830010ae9d
+cast-8.swf:6c6d1176b69bec237b3317c9e27f99ff
 children.swf:8e9201cc8fbe255759a0d3603e61252e
 classes.swf:beaebf5847965aabac05ffbe9beb5758
 clonesprite-depths-5.swf:245b74ccec801150056d3f0e148ef0a5