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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/29 22:14:12

Modified files:
        .              : ChangeLog 
        server/vm      : ActionExec.cpp 

Log message:
        (call operator): interrupt execution if an opcode is advertised to cross
        the code segment boundaries. Fixes bug #22150.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5519&r2=1.5520
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.65&r2=1.66

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5519
retrieving revision 1.5520
diff -u -b -r1.5519 -r1.5520
--- ChangeLog   29 Jan 2008 21:23:44 -0000      1.5519
+++ ChangeLog   29 Jan 2008 22:14:12 -0000      1.5520
@@ -1,5 +1,8 @@
 2008-01-29 Sandro Santilli <address@hidden>
 
+       * server/vm/ActionExec.cpp (call operator): interrupt
+         execution if an opcode is advertised to cross the code
+         segment boundaries. Fixes bug #22150.
        * libbase/jpeg.cpp: don't long jump in the constructor.
          Fixes bug #22147.
        * server/fill_style.cpp (create_gradient_bitmap): fix a probably

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- server/vm/ActionExec.cpp    24 Jan 2008 11:12:27 -0000      1.65
+++ server/vm/ActionExec.cpp    29 Jan 2008 22:14:12 -0000      1.66
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ActionExec.cpp,v 1.65 2008/01/24 11:12:27 strk Exp $ */
+/* $Id: ActionExec.cpp,v 1.66 2008/01/29 22:14:12 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "gnashconfig.h"
@@ -94,6 +94,8 @@
        env(newEnv),
        retval(nRetVal)
 {
+       assert(stop_pc < code.size());
+
        //GNASH_REPORT_FUNCTION;
 
        // See comment in header
@@ -326,6 +328,7 @@
                          length, (int)length, (unsigned)action_id, pc,
                          stop_pc);
                        );
+                       break; // no way to recover from this actually..
                        //throw ActionException(ss.str());;
                        // Give this action handler a chance anyway.
                        // Maybe it will be able to do something about