Fix potential heap corruption. Sometimes called g_free() on string

2002-12-16  Tor Lillqvist  <tml@iki.fi>

	* glib/gspawn-win32.c (do_spawn): Fix potential heap
	corruption. Sometimes called g_free() on string literal.

diff --git a/ChangeLog b/ChangeLog
index 23cb5fb..15aaa83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-16  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gspawn-win32.c (do_spawn): Fix potential heap
+       corruption. Sometimes called g_free() on string literal.
+
 Sun Dec 15 19:51:58 2002  Owen Taylor  <otaylor@redhat.com>
 
        * m4macros/glib-gettext.m4: AC_SUBST() DATADIRNAME, not 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 23cb5fb..15aaa83 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-12-16  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gspawn-win32.c (do_spawn): Fix potential heap
+       corruption. Sometimes called g_free() on string literal.
+
 Sun Dec 15 19:51:58 2002  Owen Taylor  <otaylor@redhat.com>
 
        * m4macros/glib-gettext.m4: AC_SUBST() DATADIRNAME, not 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 23cb5fb..15aaa83 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2002-12-16  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gspawn-win32.c (do_spawn): Fix potential heap
+       corruption. Sometimes called g_free() on string literal.
+
 Sun Dec 15 19:51:58 2002  Owen Taylor  <otaylor@redhat.com>
 
        * m4macros/glib-gettext.m4: AC_SUBST() DATADIRNAME, not 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 23cb5fb..15aaa83 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-12-16  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gspawn-win32.c (do_spawn): Fix potential heap
+       corruption. Sometimes called g_free() on string literal.
+
 Sun Dec 15 19:51:58 2002  Owen Taylor  <otaylor@redhat.com>
 
        * m4macros/glib-gettext.m4: AC_SUBST() DATADIRNAME, not 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 23cb5fb..15aaa83 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-12-16  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gspawn-win32.c (do_spawn): Fix potential heap
+       corruption. Sometimes called g_free() on string literal.
+
 Sun Dec 15 19:51:58 2002  Owen Taylor  <otaylor@redhat.com>
 
        * m4macros/glib-gettext.m4: AC_SUBST() DATADIRNAME, not 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 23cb5fb..15aaa83 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-12-16  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gspawn-win32.c (do_spawn): Fix potential heap
+       corruption. Sometimes called g_free() on string literal.
+
 Sun Dec 15 19:51:58 2002  Owen Taylor  <otaylor@redhat.com>
 
        * m4macros/glib-gettext.m4: AC_SUBST() DATADIRNAME, not 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 23cb5fb..15aaa83 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-12-16  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gspawn-win32.c (do_spawn): Fix potential heap
+       corruption. Sometimes called g_free() on string literal.
+
 Sun Dec 15 19:51:58 2002  Owen Taylor  <otaylor@redhat.com>
 
        * m4macros/glib-gettext.m4: AC_SUBST() DATADIRNAME, not 

diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c
index ab6eb2d..fc5cb43 100644 (file)
--- a/glib/gspawn-win32.c
+++ b/glib/gspawn-win32.c
@@ -606,9 +606,10 @@ do_spawn (gboolean              dont_wait,
     }
 
   if (working_directory && *working_directory)
+    /* The g_strdup() to lose the constness */
     new_argv[ARG_WORKING_DIRECTORY] = g_strdup (working_directory);
   else
-    new_argv[ARG_WORKING_DIRECTORY] = "-";
+    new_argv[ARG_WORKING_DIRECTORY] = g_strdup ("-");
 
   if (close_descriptors)
     new_argv[ARG_CLOSE_DESCRIPTORS] = "y";