2007-06-19 Matthew Allum <mallum@openedhand.com>

        * clutter/clutter-main.c: (clutter_init_with_args), (clutter_init):
        Safer checks for setting progname if NULL is passed in init.

diff --git a/ChangeLog b/ChangeLog
index db1f121..57b169a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-19  Matthew Allum  <mallum@openedhand.com>
+
+       * clutter/clutter-main.c: (clutter_init_with_args), (clutter_init):
+       Safer checks for setting progname if NULL is passed in init.
+
 2007-06-19  Emmanuele Bassi  <ebassi@openedhand.com>
 
        * autogen.sh: autoreconf needs a README.

diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index 86a1748..39418d3 100644 (file)
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -598,8 +598,8 @@ clutter_init_with_args (int            *argc,
   if (clutter_is_initialized)
     return CLUTTER_INIT_SUCCESS;
 
-  if (*argc > 0)
-    g_set_prgname (*argv[0]);
+  if (argc && *argc > 0 && *argv)
+    g_set_prgname ((*argv)[0]);
 
   clutter_base_init ();
 
@@ -694,8 +694,8 @@ clutter_init (int    *argc,
   if (clutter_is_initialized)
     return CLUTTER_INIT_SUCCESS;
 
-  if (*argc > 0)
-    g_set_prgname (*argv[0]);
+  if (argc && *argc > 0 && *argv)
+    g_set_prgname ((*argv)[0]);
 
   clutter_base_init ();