Copy trailing NULL into new ARGV array. (#67673)

Sat Dec 29 15:07:21 2001  Owen Taylor  <otaylor@redhat.com>

        * glib/gspawn.c (script_execute): Copy	trailing	NULL
        into new ARGV array. (#67673)

diff --git a/ChangeLog b/ChangeLog
index b657288..5913279 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 29 15:07:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gspawn.c (script_execute): Copy trailing NULL
+       into new ARGV array. (#67673)
+
 2001-12-28  Sven Neumann  <sven@gimp.org>
 
        * glib/gmessages.c: only include printf_string_upper_bound() if

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b657288..5913279 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Sat Dec 29 15:07:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gspawn.c (script_execute): Copy trailing NULL
+       into new ARGV array. (#67673)
+
 2001-12-28  Sven Neumann  <sven@gimp.org>
 
        * glib/gmessages.c: only include printf_string_upper_bound() if

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b657288..5913279 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Dec 29 15:07:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gspawn.c (script_execute): Copy trailing NULL
+       into new ARGV array. (#67673)
+
 2001-12-28  Sven Neumann  <sven@gimp.org>
 
        * glib/gmessages.c: only include printf_string_upper_bound() if

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index b657288..5913279 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Sat Dec 29 15:07:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gspawn.c (script_execute): Copy trailing NULL
+       into new ARGV array. (#67673)
+
 2001-12-28  Sven Neumann  <sven@gimp.org>
 
        * glib/gmessages.c: only include printf_string_upper_bound() if

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b657288..5913279 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sat Dec 29 15:07:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gspawn.c (script_execute): Copy trailing NULL
+       into new ARGV array. (#67673)
+
 2001-12-28  Sven Neumann  <sven@gimp.org>
 
        * glib/gmessages.c: only include printf_string_upper_bound() if

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b657288..5913279 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sat Dec 29 15:07:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gspawn.c (script_execute): Copy trailing NULL
+       into new ARGV array. (#67673)
+
 2001-12-28  Sven Neumann  <sven@gimp.org>
 
        * glib/gmessages.c: only include printf_string_upper_bound() if

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b657288..5913279 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sat Dec 29 15:07:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gspawn.c (script_execute): Copy trailing NULL
+       into new ARGV array. (#67673)
+
 2001-12-28  Sven Neumann  <sven@gimp.org>
 
        * glib/gmessages.c: only include printf_string_upper_bound() if

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b657288..5913279 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sat Dec 29 15:07:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gspawn.c (script_execute): Copy trailing NULL
+       into new ARGV array. (#67673)
+
 2001-12-28  Sven Neumann  <sven@gimp.org>
 
        * glib/gmessages.c: only include printf_string_upper_bound() if

diff --git a/glib/gspawn.c b/glib/gspawn.c
index c35d92c..b2d1bae 100644 (file)
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -1248,13 +1248,13 @@ script_execute (const gchar *file,
   {
     gchar **new_argv;
 
-    new_argv = g_new0 (gchar*, argc + 1);
+    new_argv = g_new0 (gchar*, argc + 2); /* /bin/sh and NULL */
     
     new_argv[0] = (char *) "/bin/sh";
     new_argv[1] = (char *) file;
-    while (argc > 1)
+    while (argc > 0)
       {
-       new_argv[argc] = argv[argc - 1];
+       new_argv[argc + 1] = argv[argc];
        --argc;
       }