[Gnash-commit] gnash ChangeLog plugin/plugin.cpp

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     06/08/09 12:37:21

Modified files:
        .              : ChangeLog 
        plugin         : plugin.cpp 

Log message:
        Don't abort on URL arguments without a name; merely ignore them (bug 
#17161).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.610&r2=1.611
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.36&r2=1.37

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.610
retrieving revision 1.611
diff -u -b -r1.610 -r1.611
--- ChangeLog   9 Aug 2006 11:47:29 -0000       1.610
+++ ChangeLog   9 Aug 2006 12:37:20 -0000       1.611
@@ -1,7 +1,12 @@
 2006-08-09 Bastiaan Jacques <address@hidden>
 
+       * plugin/plugin.cpp: Don't abort on URL arguments without a name;
+       merely ignore them (bug #17161). 
+
+2006-08-09 Bastiaan Jacques <address@hidden>
+
        * gui/gtk_glue_gtkglext.cpp: Fix typo. Properly dereference the
-       argument to getopt().
+       argument to getopt() (bug #17265).
        * gui/gui.cpp: Remove an unused variable.
 
 2006-08-08  Rob Savoye  <address@hidden>

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- plugin/plugin.cpp   27 Jul 2006 14:54:43 -0000      1.36
+++ plugin/plugin.cpp   9 Aug 2006 12:37:21 -0000       1.37
@@ -538,17 +538,14 @@
            start++;
        }
        end = opts.find("&", start);
-       if (end == string::npos) {
-           end = opts.size();
-       }
        if (eq == string::npos) {
            eq = opts.size();
        }
        // Some URLs we can't parse for odd reasons, so this prevents
        // Firefox from crashing in those cases.
        if (end == string::npos) {
-           dbglogfile << "ERROR: Can't parse URL!" << endl;
-           return NPERR_INVALID_PARAM;
+           dbglogfile << "INFO: Ignoring URL appendix without name." << endl;
+           goto process;
        } else {
            name = opts.substr(start, eq);
            value = opts.substr(eq+1, end-eq-1);
@@ -581,6 +578,8 @@
 //     log_msg("%s: Open stream for %s, this = %p", __FUNCTION__,
 //        fname.c_str(), (void *)this);
 
+process:
+
     sprintf(tmp, "Loading Flash movie %s", fname.c_str());
     WriteStatus(tmp);