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

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     06/09/16 23:17:26

Modified files:
        .              : ChangeLog 
        plugin         : plugin.cpp 

Log message:
        Add NULL checks to avoid attempting to create an std::string from a 
NULL character pointer (bug #17776).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.845&r2=1.846
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.53&r2=1.54

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.845
retrieving revision 1.846
diff -u -b -r1.845 -r1.846
--- ChangeLog   16 Sep 2006 19:36:05 -0000      1.845
+++ ChangeLog   16 Sep 2006 23:17:25 -0000      1.846
@@ -1,3 +1,8 @@
+2006-09-17 Bastiaan Jacques <address@hidden>
+
+       * plugin/plugin.cpp: add NULL checks to avoid attempting to create an
+       std::string from a NULL character pointer (bug #17776).
+
 2006-09-16 Patrice Dumas <address@hidden>
 
        * libbase/log.cpp, libbase/network.cpp, libbase/network.h:

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- plugin/plugin.cpp   16 Sep 2006 16:30:44 -0000      1.53
+++ plugin/plugin.cpp   16 Sep 2006 23:17:26 -0000      1.54
@@ -252,8 +252,15 @@
 {
        for (size_t i=0, n=data->argc; i<n; ++i)
        {
-               string name ( data->argn[i] );
-               string val ( data->argv[i] );
+               string name, val;
+
+               if (data->argn[i]) {
+                       name = data->argn[i];
+               }
+
+               if (data->argv[i]) {
+                       val = data->argv[i];
+               }
                //log_msg("PARAM: %s = %s", name.c_str(), val.c_str());
                _params[name] = val;
        }