From 969394d016e6dd0fe22bf6719e5a95bfc269fa85 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 16 Dec 2002 05:22:08 +0000 Subject: [PATCH] Fix potential heap corruption. Sometimes called g_free() on string 2002-12-16 Tor Lillqvist * glib/gspawn-win32.c (do_spawn): Fix potential heap corruption. Sometimes called g_free() on string literal. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gspawn-win32.c | 3 ++- 8 files changed, 37 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 23cb5fb..15aaa83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-12-16 Tor Lillqvist + + * 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 * m4macros/glib-gettext.m4: AC_SUBST() DATADIRNAME, not diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 23cb5fb..15aaa83 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-12-16 Tor Lillqvist + + * 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 * m4macros/glib-gettext.m4: AC_SUBST() DATADIRNAME, not diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 23cb5fb..15aaa83 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2002-12-16 Tor Lillqvist + + * 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 * m4macros/glib-gettext.m4: AC_SUBST() DATADIRNAME, not diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 23cb5fb..15aaa83 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-12-16 Tor Lillqvist + + * 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 * m4macros/glib-gettext.m4: AC_SUBST() DATADIRNAME, not diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 23cb5fb..15aaa83 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-12-16 Tor Lillqvist + + * 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 * m4macros/glib-gettext.m4: AC_SUBST() DATADIRNAME, not diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 23cb5fb..15aaa83 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-12-16 Tor Lillqvist + + * 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 * m4macros/glib-gettext.m4: AC_SUBST() DATADIRNAME, not diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 23cb5fb..15aaa83 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-12-16 Tor Lillqvist + + * 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 * m4macros/glib-gettext.m4: AC_SUBST() DATADIRNAME, not diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c index ab6eb2d..fc5cb43 100644 --- 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"; -- 2.7.4