Add check for if argc is 0.

2004-10-05  Anders Carlsson  <andersca@gnome.org>

	* glib/goption.c: (g_option_context_parse):
	Add check for if argc is 0.

	* tests/option-test.c: (empty_test3), (main):
	Add test case.

diff --git a/ChangeLog b/ChangeLog
index 60bcde1..19801fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-05  Anders Carlsson  <andersca@gnome.org>
+
+       * glib/goption.c: (g_option_context_parse):
+       Add check for if argc is 0.
+       
+       * tests/option-test.c: (empty_test3), (main):
+       Add test case.
+       
 2004-10-05  Matthias Clasen  <mclasen@redhat.com>
 
        * NEWS: Update

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 60bcde1..19801fa 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2004-10-05  Anders Carlsson  <andersca@gnome.org>
+
+       * glib/goption.c: (g_option_context_parse):
+       Add check for if argc is 0.
+       
+       * tests/option-test.c: (empty_test3), (main):
+       Add test case.
+       
 2004-10-05  Matthias Clasen  <mclasen@redhat.com>
 
        * NEWS: Update

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 60bcde1..19801fa 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2004-10-05  Anders Carlsson  <andersca@gnome.org>
+
+       * glib/goption.c: (g_option_context_parse):
+       Add check for if argc is 0.
+       
+       * tests/option-test.c: (empty_test3), (main):
+       Add test case.
+       
 2004-10-05  Matthias Clasen  <mclasen@redhat.com>
 
        * NEWS: Update

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 60bcde1..19801fa 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2004-10-05  Anders Carlsson  <andersca@gnome.org>
+
+       * glib/goption.c: (g_option_context_parse):
+       Add check for if argc is 0.
+       
+       * tests/option-test.c: (empty_test3), (main):
+       Add test case.
+       
 2004-10-05  Matthias Clasen  <mclasen@redhat.com>
 
        * NEWS: Update

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 60bcde1..19801fa 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2004-10-05  Anders Carlsson  <andersca@gnome.org>
+
+       * glib/goption.c: (g_option_context_parse):
+       Add check for if argc is 0.
+       
+       * tests/option-test.c: (empty_test3), (main):
+       Add test case.
+       
 2004-10-05  Matthias Clasen  <mclasen@redhat.com>
 
        * NEWS: Update

diff --git a/glib/goption.c b/glib/goption.c
index 1868505..8001bad 100644 (file)
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -825,7 +825,7 @@ g_option_context_parse (GOptionContext   *context,
   GList *list;
 
   /* Set program name */
-  if (argc && argv)
+  if (argc && argv && *argc)
     {
       gchar *prgname;
       

diff --git a/tests/option-test.c b/tests/option-test.c
index d08b223..daf7591 100644 (file)
--- a/tests/option-test.c
+++ b/tests/option-test.c
@@ -508,6 +508,22 @@ empty_test2 (void)
   g_option_context_free (context);
 }
 
+void
+empty_test3 (void)
+{
+  GOptionContext *context;
+  gint argc;
+  gchar **argv;
+
+  argc = 0;
+  argv = NULL;
+
+  context = g_option_context_new (NULL);
+  g_option_context_parse (context, &argc, &argv, NULL);
+  
+  g_option_context_free (context);
+}
+
 int
 main (int argc, char **argv)
 {
@@ -537,6 +553,7 @@ main (int argc, char **argv)
   /* Test parsing empty args */
   empty_test1 ();
   empty_test2 ();
-  
+  empty_test3 ();
+
   return 0;
 }