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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/08/07 18:56:14

Modified files:
        .              : ChangeLog 
        server/swf     : ASHandlers.cpp 

Log message:
                * server/swf/ASHandlers.cpp (ActionBranchIfTrue):               
                  assertion checking, minor cleanup.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.597&r2=1.598
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/ASHandlers.cpp?cvsroot=gnash&r1=1.45&r2=1.46

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.597
retrieving revision 1.598
diff -u -b -r1.597 -r1.598
--- ChangeLog   7 Aug 2006 18:35:23 -0000       1.597
+++ ChangeLog   7 Aug 2006 18:56:14 -0000       1.598
@@ -1,5 +1,7 @@
 2006-08-07 Sandro Santilli <address@hidden>
 
+       * server/swf/ASHandlers.cpp (ActionBranchIfTrue):
+         assertion checking, minor cleanup.
        * gui/gui.cpp: removed unused parameters warnings
        * server/stream.h: added skip_bytes() method 
        * server/swf/tag_loaders.cpp: fixed compiler warnings.

Index: server/swf/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ASHandlers.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- server/swf/ASHandlers.cpp   6 Aug 2006 02:00:54 -0000       1.45
+++ server/swf/ASHandlers.cpp   7 Aug 2006 18:56:14 -0000       1.46
@@ -1534,17 +1534,17 @@
 {
 //     GNASH_REPORT_FUNCTION;
 
+       // Alias these
        as_environment& env = thread.env;
-
-       ensure_stack(env, 1); // bool
-
        const action_buffer& code = thread.code;
-
-       // Alias these
        size_t& pc = thread.pc;
        size_t& next_pc = thread.next_pc;
        size_t& stop_pc = thread.stop_pc;
 
+       assert( code[pc] == SWF::ACTION_BRANCHIFTRUE );
+
+       ensure_stack(env, 1); // bool
+
        int16_t offset = code.read_int16(pc+3);
 
        bool test = env.pop().to_bool();