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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/10/09 08:12:26

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

Log message:
                * server/vm/ActionExec.cpp (call operator): don't execute 
anything
                  if scripts are disabled. Fixes bug #21295.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4572&r2=1.4573
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.56&r2=1.57

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4572
retrieving revision 1.4573
diff -u -b -r1.4572 -r1.4573
--- ChangeLog   8 Oct 2007 16:49:15 -0000       1.4572
+++ ChangeLog   9 Oct 2007 08:12:25 -0000       1.4573
@@ -1,3 +1,8 @@
+2007-10-09 Sandro Santilli <address@hidden>
+
+       * server/vm/ActionExec.cpp (call operator): don't execute anything
+         if scripts are disabled. Fixes bug #21295.
+
 2007-10-08 Udo Giacomozzi <address@hidden>
 
        * libbase/tu_timer.cpp: Avoid range problems. Fixes bug #21289

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- server/vm/ActionExec.cpp    2 Oct 2007 15:44:51 -0000       1.56
+++ server/vm/ActionExec.cpp    9 Oct 2007 08:12:26 -0000       1.57
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ActionExec.cpp,v 1.56 2007/10/02 15:44:51 strk Exp $ */
+/* $Id: ActionExec.cpp,v 1.57 2007/10/09 08:12:26 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -152,6 +152,9 @@
     }
 #endif
 
+    // Do not execute if scripts are disabled
+    if ( VM::get().getRoot().scriptsDisabled() ) return;
+
     static const SWFHandlers& ash = SWFHandlers::instance();
                
     _original_target = env.get_target();