Merge from 2.4:

Sun May  9 02:04:14 2004  Matthias Clasen  <maclas@gmx.de>

	Merge from 2.4:

	* glib/guniprop.c (g_utf8_casefold): Avoid an unnecessary
	memleak.  (#141998, Nikolai Weibull)

diff --git a/ChangeLog b/ChangeLog
index 9f30847..94ebf89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun May  9 02:04:14 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Merge from 2.4:
+       
+       * glib/guniprop.c (g_utf8_casefold): Avoid an unnecessary
+       memleak.  (#141998, Nikolai Weibull)
+
 Sat May  8 23:02:26 2004  Matthias Clasen  <maclas@gmx.de>
 
        Merge from 2.4:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9f30847..94ebf89 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sun May  9 02:04:14 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Merge from 2.4:
+       
+       * glib/guniprop.c (g_utf8_casefold): Avoid an unnecessary
+       memleak.  (#141998, Nikolai Weibull)
+
 Sat May  8 23:02:26 2004  Matthias Clasen  <maclas@gmx.de>
 
        Merge from 2.4:

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 9f30847..94ebf89 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+Sun May  9 02:04:14 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Merge from 2.4:
+       
+       * glib/guniprop.c (g_utf8_casefold): Avoid an unnecessary
+       memleak.  (#141998, Nikolai Weibull)
+
 Sat May  8 23:02:26 2004  Matthias Clasen  <maclas@gmx.de>
 
        Merge from 2.4:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9f30847..94ebf89 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sun May  9 02:04:14 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Merge from 2.4:
+       
+       * glib/guniprop.c (g_utf8_casefold): Avoid an unnecessary
+       memleak.  (#141998, Nikolai Weibull)
+
 Sat May  8 23:02:26 2004  Matthias Clasen  <maclas@gmx.de>
 
        Merge from 2.4:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9f30847..94ebf89 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sun May  9 02:04:14 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Merge from 2.4:
+       
+       * glib/guniprop.c (g_utf8_casefold): Avoid an unnecessary
+       memleak.  (#141998, Nikolai Weibull)
+
 Sat May  8 23:02:26 2004  Matthias Clasen  <maclas@gmx.de>
 
        Merge from 2.4:

diff --git a/glib/guniprop.c b/glib/guniprop.c
index 54d191e..bd5fc4e 100644 (file)
--- a/glib/guniprop.c
+++ b/glib/guniprop.c
@@ -942,11 +942,12 @@ gchar *
 g_utf8_casefold (const gchar *str,
                 gssize       len)
 {
-  GString *result = g_string_new (NULL);
+  GString *result;
   const char *p;
 
   g_return_val_if_fail (str != NULL, NULL);
 
+  result = g_string_new (NULL);
   p = str;
   while ((len < 0 || p < str + len) && *p)
     {