strdup result so caller doesn't free internally managed memory.

Thu Aug  5 20:53:00 2004  Ray Strode  <rstrode@redhat.com>

	* glib/gutils.h (g_get_codeset): strdup result so caller
	doesn't free internally managed memory.

diff --git a/ChangeLog b/ChangeLog
index fad4b68..ae94c8d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug  5 20:53:00 2004  Ray Strode  <rstrode@redhat.com>
+
+       * glib/gutils.h (g_get_codeset): strdup result so caller
+       doesn't free internally managed memory.
+
 2004-08-04  Tor Lillqvist  <tml@iki.fi>
 
        * glib/glib.def: Add glib_check_version.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fad4b68..ae94c8d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Aug  5 20:53:00 2004  Ray Strode  <rstrode@redhat.com>
+
+       * glib/gutils.h (g_get_codeset): strdup result so caller
+       doesn't free internally managed memory.
+
 2004-08-04  Tor Lillqvist  <tml@iki.fi>
 
        * glib/glib.def: Add glib_check_version.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index fad4b68..ae94c8d 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Thu Aug  5 20:53:00 2004  Ray Strode  <rstrode@redhat.com>
+
+       * glib/gutils.h (g_get_codeset): strdup result so caller
+       doesn't free internally managed memory.
+
 2004-08-04  Tor Lillqvist  <tml@iki.fi>
 
        * glib/glib.def: Add glib_check_version.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fad4b68..ae94c8d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Aug  5 20:53:00 2004  Ray Strode  <rstrode@redhat.com>
+
+       * glib/gutils.h (g_get_codeset): strdup result so caller
+       doesn't free internally managed memory.
+
 2004-08-04  Tor Lillqvist  <tml@iki.fi>
 
        * glib/glib.def: Add glib_check_version.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fad4b68..ae94c8d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Aug  5 20:53:00 2004  Ray Strode  <rstrode@redhat.com>
+
+       * glib/gutils.h (g_get_codeset): strdup result so caller
+       doesn't free internally managed memory.
+
 2004-08-04  Tor Lillqvist  <tml@iki.fi>
 
        * glib/glib.def: Add glib_check_version.

diff --git a/glib/gutils.c b/glib/gutils.c
index 07a09c1..347b7cf 100644 (file)
--- 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