[Gnash-commit] gnash ChangeLog gui/Player.cpp server/impl.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/16 08:06:17

Modified files:
        .              : ChangeLog 
        gui            : Player.cpp 
        server         : impl.cpp 

Log message:
        fix confusing SECURITY message about sandbox appending.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5408&r2=1.5409
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.136&r2=1.137

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5408
retrieving revision 1.5409
diff -u -b -r1.5408 -r1.5409
--- ChangeLog   16 Jan 2008 07:37:32 -0000      1.5408
+++ ChangeLog   16 Jan 2008 08:06:16 -0000      1.5409
@@ -1,5 +1,8 @@
 2008-01-16 Sandro Santilli <address@hidden>
 
+       * gui/Player.cpp: fix confusing SECURITY message about sandbox
+         appending.
+       * server/impl.cpp: remove dead code.
        * server/sprite_instance.cpp (processCompletedLoadVariableRequest):
          Appropriately case variable names.
 

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- gui/Player.cpp      28 Dec 2007 19:35:14 -0000      1.75
+++ gui/Player.cpp      16 Jan 2008 08:06:17 -0000      1.76
@@ -228,11 +228,13 @@
 
 #if 1 // add the *directory* the movie was loaded from to the local sandbox 
path
                        size_t lastSlash = path.find_last_of('/');
-                       rcfile.addLocalSandboxPath(path.substr(0, lastSlash+1));
+                       std::string dir = path.substr(0, lastSlash+1);
+                       rcfile.addLocalSandboxPath(dir);
+                       log_debug(_("%s appended to local sandboxes"), 
dir.c_str());
 #else // add the *file* to be loaded to the local sandbox path
                        rcfile.addLocalSandboxPath(path);
-#endif
                        log_debug(_("%s appended to local sandboxes"), 
url.path().c_str());
+#endif
                }
 
                // _url should be always set at this point...

Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -b -r1.136 -r1.137
--- server/impl.cpp     14 Jan 2008 20:05:13 -0000      1.136
+++ server/impl.cpp     16 Jan 2008 08:06:17 -0000      1.137
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: impl.cpp,v 1.136 2008/01/14 20:05:13 strk Exp $ */
+/* $Id: impl.cpp,v 1.137 2008/01/16 08:06:17 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -97,32 +97,6 @@
   assert(!globals::baseurl.get());
   globals::baseurl.reset(new URL(url));
   log_debug(_("Base url set to: %s"), globals::baseurl->str().c_str());
-
-#ifdef 
ALLOW_ACCESS_TO_ARBITRARY_LOCATIONS_OF_MY_FILESYSTEM_FROM_FLASH_MOVIE_PUBLISHERS
-// 
-// Adding the "base url" as a local sandbox used to be kind of fine until we
-// added support for the 'base' attribute of EMBED and OBJECT html tags.
-// That attribute determines how to resolve relative urls, so affects the
-// call to set_base_url. 
-// This means that the HTML author might specify '/' as the base url and obtain
-// access to any filesystem location if we do append the 'virtual base url'
-// to the local sandbox paths.
-//
-#if 0
-  // If base url is a local file, we push the local file's directory
-  // to the list of local sandboxes
-  if ( url.protocol() == "file" )
-  {
-    RcInitFile& rcfile = RcInitFile::getDefaultInstance();
-
-    const std::string& path = url.path();
-
-    size_t lastSlash = path.find_last_of('/');
-    rcfile.addLocalSandboxPath(path.substr(0, lastSlash+1));
-    log_debug(_("Dir %s appended to local sandboxes"), url.path().c_str());
-  }
-#endif
-#endif
 }
 
 const URL&