From cf12bdfcd15993fca24f9db7195ec64b87cb16eb Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 5 Aug 2004 20:53:25 +0000 Subject: [PATCH] strdup result so caller doesn't free internally managed memory. Thu Aug 5 20:53:00 2004 Ray Strode * glib/gutils.h (g_get_codeset): strdup result so caller doesn't free internally managed memory. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gutils.c | 4 ++-- 6 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fad4b68f..ae94c8d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Aug 5 20:53:00 2004 Ray Strode + + * glib/gutils.h (g_get_codeset): strdup result so caller + doesn't free internally managed memory. + 2004-08-04 Tor Lillqvist * glib/glib.def: Add glib_check_version. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fad4b68f..ae94c8d1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Aug 5 20:53:00 2004 Ray Strode + + * glib/gutils.h (g_get_codeset): strdup result so caller + doesn't free internally managed memory. + 2004-08-04 Tor Lillqvist * glib/glib.def: Add glib_check_version. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index fad4b68f..ae94c8d1 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Thu Aug 5 20:53:00 2004 Ray Strode + + * glib/gutils.h (g_get_codeset): strdup result so caller + doesn't free internally managed memory. + 2004-08-04 Tor Lillqvist * glib/glib.def: Add glib_check_version. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fad4b68f..ae94c8d1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Aug 5 20:53:00 2004 Ray Strode + + * glib/gutils.h (g_get_codeset): strdup result so caller + doesn't free internally managed memory. + 2004-08-04 Tor Lillqvist * glib/glib.def: Add glib_check_version. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fad4b68f..ae94c8d1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Aug 5 20:53:00 2004 Ray Strode + + * glib/gutils.h (g_get_codeset): strdup result so caller + doesn't free internally managed memory. + 2004-08-04 Tor Lillqvist * glib/glib.def: Add glib_check_version. diff --git a/glib/gutils.c b/glib/gutils.c index 07a09c16..347b7cf2 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -1283,11 +1283,11 @@ g_nullify_pointer (gpointer *nullify_location) gchar * g_get_codeset (void) { - gchar *charset; + const gchar *charset; g_get_charset (&charset); - return charset; + return g_strdup (charset); } #ifdef ENABLE_NLS -- 2.34.1