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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/02/20 15:59:44

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

Log message:
        (CommonGetUrl): only loadVariables if targetLoad flag is set (tested).
        Log an SWF error if loadVariables is set but targtLoad is clear.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5706&r2=1.5707
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.196&r2=1.197

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5706
retrieving revision 1.5707
diff -u -b -r1.5706 -r1.5707
--- ChangeLog   20 Feb 2008 15:54:58 -0000      1.5706
+++ ChangeLog   20 Feb 2008 15:59:43 -0000      1.5707
@@ -1,3 +1,9 @@
+2008-02-20 Sandro Santilli <address@hidden>
+
+       * server/vm/ASHandlers.cpp (CommonGetUrl): only loadVariables if
+         targetLoad flag is set (tested). Log an SWF error if loadVariables
+         is set but targtLoad is clear.
+
 2008-02-20 Bastiaan Jacques <address@hidden>
 
        * server/parser/video_stream_def.cpp: Don't make a fuss about embedded

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -b -r1.196 -r1.197
--- server/vm/ASHandlers.cpp    19 Feb 2008 19:20:57 -0000      1.196
+++ server/vm/ASHandlers.cpp    20 Feb 2008 15:59:44 -0000      1.197
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.196 2008/02/19 19:20:57 bwy Exp $ */
+/* $Id: ASHandlers.cpp,v 1.197 2008/02/20 15:59:44 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "gnashconfig.h"
@@ -2199,6 +2199,10 @@
        character* target_ch = env.find_target(target.to_string());
        sprite_instance* target_movie = target_ch ? target_ch->to_movie() : 0;
 
+       movie_root& mr = VM::get().getRoot();
+
+       if ( loadTargetFlag )
+       {
        if ( loadVariableFlag )
        {
                log_debug(_("getURL2 loadVariable"));
@@ -2222,10 +2226,6 @@
                return;
        }
 
-       movie_root& mr = VM::get().getRoot();
-
-       if ( loadTargetFlag )
-       {
                // TODO: always pass directly to movie_root::loadMovie ?
 
                log_debug(_("getURL2 target load"));
@@ -2279,6 +2279,13 @@
                return;
        }
 
+       if ( loadVariableFlag )
+       {
+               IF_VERBOSE_MALFORMED_SWF (
+                       log_swferror("loadVariables flag of a GETURL2 opcode is 
set, but loadTarget is clear");
+               );
+       }
+
        if ( sendVarsMethod )
        {
                log_unimpl (_("Unhandled GetUrl2 sendVariableMethod (%d)"