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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_8_1
Changes by:     Sandro Santilli <strk>  07/08/18 21:52:34

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

Log message:
         * server/vm/ASHandlers.cpp (CommonGetUrl): always check
           for URL (security). Give precedence to loadVariable
           calls even if target is _level#. Fixes load of
           uptoten.com.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.36&r2=1.3971.2.37
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.118&r2=1.118.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.36
retrieving revision 1.3971.2.37
diff -u -b -r1.3971.2.36 -r1.3971.2.37
--- ChangeLog   18 Aug 2007 16:48:54 -0000      1.3971.2.36
+++ ChangeLog   18 Aug 2007 21:52:33 -0000      1.3971.2.37
@@ -1,5 +1,9 @@
 2007-08-18 Sandro Santilli <address@hidden>
 
+       * server/vm/ASHandlers.cpp (CommonGetUrl): always check
+         for URL (security). Give precedence to loadVariable
+         calls even if target is _level#. Fixes load of
+         uptoten.com.
        * plugin/plugin.cpp: Use the environmental variable
          GNASH_PLUGIN_DESCRIPTION for the plugin description
          (when set).

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.118
retrieving revision 1.118.2.1
diff -u -b -r1.118 -r1.118.2.1
--- server/vm/ASHandlers.cpp    6 Aug 2007 20:42:57 -0000       1.118
+++ server/vm/ASHandlers.cpp    18 Aug 2007 21:52:33 -0000      1.118.2.1
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.118 2007/08/06 20:42:57 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.118.2.1 2007/08/18 21:52:33 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1818,18 +1818,21 @@
        const URL& baseurl = get_base_url();
        URL url(url_s, baseurl);
 
-       log_msg(_("get url: target=%s, url=%s (%s), method=%x"), 
target_string.c_str(),
-               url.str().c_str(), url_c, method);
+       log_msg(_("get url: target=%s, url=%s (%s), method=%x (sendVars:%X, 
loadTarget:%d, loadVariable:%d)"), target_string.c_str(),
+               url.str().c_str(), url_c, method, sendVarsMethod, 
loadTargetFlag, loadVariableFlag);
 
-       if ( target_string.compare(0, 6, "_level") == 0 && 
target_string.find_first_not_of("0123456789", 7) == string::npos )
+       if ( ! URLAccessManager::allow(url) )
        {
-               unsigned int levelno = atoi(target_string.c_str()+6);
-               log_debug(_("Testing _level loading (level %u)"), levelno);
-               VM::get().getRoot().loadLevel(levelno, url);
+               return;
        }
-       else if ( loadTargetFlag )
-       {
+
                character* target_ch = env.find_target(target);
+       sprite_instance* target_movie = target_ch ? target_ch->to_movie() : 0;
+
+       if ( loadVariableFlag )
+       {
+               log_msg(_("getURL2 loadVariable"));
+
                if ( ! target_ch )
                {
                        log_error(_("get url: target %s not found"),
@@ -1837,7 +1840,6 @@
                        return;
                }
 
-               sprite_instance* target_movie = target_ch->to_movie();
                if ( ! target_movie )
                {
                        log_error(_("get url: target %s is not a sprite"),
@@ -1845,23 +1847,14 @@
                        return;
                }
 
-               if ( loadVariableFlag )
-               {
-                       log_msg(_("getURL2 loadVariable"));
-
-                       //log_unimpl("Unhandled GetUrl2 loadVariable flag. 
loadTargetFlag=%d, target=%s (%s)", loadTargetFlag, target.typeOf(), 
target.to_string(&env).c_str());
                        target_movie->loadVariables(url, sendVarsMethod);
-               }
-               else
-               {
-                       log_msg(_("getURL2 target load"));
 
-                       // Check host security
-                       if ( ! URLAccessManager::allow(url) )
-                       {
                                return;
                        }
 
+       if ( loadTargetFlag )
+       {
+               log_msg(_("getURL2 target load"));
 
                        if ( sendVarsMethod )
                        {
@@ -1870,13 +1863,30 @@
                                        sendVarsMethod);
                        }
 
-                       target_movie->loadMovie(url);
+               if ( ! target_ch )
+               {
+                       if ( target_string.compare(0, 6, "_level") == 0 && 
target_string.find_first_not_of("0123456789", 7) == string::npos )
+                       {
+                               unsigned int levelno = 
atoi(target_string.c_str()+6);
+                               log_debug(_("Testing _level loading (level 
%u)"), levelno);
+                               VM::get().getRoot().loadLevel(levelno, url);
+                               return;
                }
+
+                       log_error(_("get url: target %s not found"),
+                               target_string.c_str());
+                       return;
        }
-       else
-       {
-               if ( ! URLAccessManager::allow(url) )
+
+               if ( ! target_movie )
                {
+                       log_error(_("get url: target %s is not a sprite"),
+                               target_string.c_str());
+                       return;
+               }
+
+               target_movie->loadMovie(url);
+
                        return;
                }
 
@@ -1886,19 +1896,6 @@
                                " with no loadTargetFlag"),
                                sendVarsMethod);
                }
-
-               string command = "firefox -remote \"openurl(";
-               command += url.str();
-#if 0 // target testing
-               if ( ! target_string.empty() )
-               {
-                       command += ", " + target_string;
-               }
-#endif
-               command += ")\"";
-               log_msg (_("Launching URL... %s"), command.c_str());
-               system(command.c_str());
-       }
 }
 
 // Common code for SetTarget and SetTargetExpression. See: