[Gnash-commit] gnash ChangeLog libbase/URL.cpp

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     06/09/17 19:28:57

Modified files:
        .              : ChangeLog 
        libbase        : URL.cpp 

Log message:
        Don't treat local filenames as query strings (bug #17725).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.847&r2=1.848
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/URL.cpp?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.847
retrieving revision 1.848
diff -u -b -r1.847 -r1.848
--- ChangeLog   17 Sep 2006 14:59:13 -0000      1.847
+++ ChangeLog   17 Sep 2006 19:28:57 -0000      1.848
@@ -1,3 +1,8 @@
+2006-09-17 Bastiaan Jacques <address@hidden>
+
+       * libbase/URL.cpp: Don't treat local filenames as query strings (bug
+       #17725).
+
 2006-09-17 Markus Gothe <address@hidden>
 
        * autogen.sh: Applied patch from Mike Heffner.

Index: libbase/URL.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/URL.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- libbase/URL.cpp     14 Sep 2006 01:57:57 -0000      1.26
+++ libbase/URL.cpp     17 Sep 2006 19:28:57 -0000      1.27
@@ -380,6 +380,14 @@
                return;
        }
 
+       size_t swfpos = _path.rfind(".swf");
+       if (swfpos != string::npos && swfpos > qmpos)
+       {
+               // If the questionmark precedes the file suffix, we're not 
dealing with a 
+               // query string.
+               return;
+       }
+
        _querystring = _path.substr(qmpos+1);
 
        // update _path