From: Matthias Clasen Date: Sun, 9 May 2004 06:07:16 +0000 (+0000) Subject: Merge from 2.4: X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=4b3b009b387eaae4a52ab0d337e7f948d1588d40;p=dana%2Fcg-glib.git Merge from 2.4: Sun May 9 02:04:14 2004 Matthias Clasen Merge from 2.4: * glib/guniprop.c (g_utf8_casefold): Avoid an unnecessary memleak. (#141998, Nikolai Weibull) --- diff --git a/ChangeLog b/ChangeLog index 9f308473..94ebf899 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun May 9 02:04:14 2004 Matthias Clasen + + 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 Merge from 2.4: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9f308473..94ebf899 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Sun May 9 02:04:14 2004 Matthias Clasen + + 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 Merge from 2.4: diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 9f308473..94ebf899 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +Sun May 9 02:04:14 2004 Matthias Clasen + + 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 Merge from 2.4: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9f308473..94ebf899 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Sun May 9 02:04:14 2004 Matthias Clasen + + 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 Merge from 2.4: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9f308473..94ebf899 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Sun May 9 02:04:14 2004 Matthias Clasen + + 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 Merge from 2.4: diff --git a/glib/guniprop.c b/glib/guniprop.c index 54d191ee..bd5fc4e8 100644 --- 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) {