From 6f988777288b6e2319dddea6ed0081ec242e71a0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 26 Feb 2003 00:12:42 +0000 Subject: [PATCH] Use g_strndup, not g_strdup, since we know the length in advance. 2003-02-26 Matthias Clasen * glib/gstrfuncs.c (g_strdup_vprintf): Use g_strndup, not g_strdup, since we know the length in advance. --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-12 | 3 +++ ChangeLog.pre-2-4 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ glib/gstrfuncs.c | 8 +++++--- 7 files changed, 23 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 636d299..c274f14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-02-26 Matthias Clasen + * glib/gstrfuncs.c (g_strdup_vprintf): Use g_strndup, not + g_strdup, since we know the length in advance. + * glib/gunidecomp.c (g_unicode_canonical_decomposition): Use g_malloc instead of directly using malloc. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 636d299..c274f14 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2003-02-26 Matthias Clasen + * glib/gstrfuncs.c (g_strdup_vprintf): Use g_strndup, not + g_strdup, since we know the length in advance. + * glib/gunidecomp.c (g_unicode_canonical_decomposition): Use g_malloc instead of directly using malloc. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 636d299..c274f14 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,8 @@ 2003-02-26 Matthias Clasen + * glib/gstrfuncs.c (g_strdup_vprintf): Use g_strndup, not + g_strdup, since we know the length in advance. + * glib/gunidecomp.c (g_unicode_canonical_decomposition): Use g_malloc instead of directly using malloc. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 636d299..c274f14 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,8 @@ 2003-02-26 Matthias Clasen + * glib/gstrfuncs.c (g_strdup_vprintf): Use g_strndup, not + g_strdup, since we know the length in advance. + * glib/gunidecomp.c (g_unicode_canonical_decomposition): Use g_malloc instead of directly using malloc. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 636d299..c274f14 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2003-02-26 Matthias Clasen + * glib/gstrfuncs.c (g_strdup_vprintf): Use g_strndup, not + g_strdup, since we know the length in advance. + * glib/gunidecomp.c (g_unicode_canonical_decomposition): Use g_malloc instead of directly using malloc. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 636d299..c274f14 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2003-02-26 Matthias Clasen + * glib/gstrfuncs.c (g_strdup_vprintf): Use g_strndup, not + g_strdup, since we know the length in advance. + * glib/gunidecomp.c (g_unicode_canonical_decomposition): Use g_malloc instead of directly using malloc. diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c index 9d1bf7d..5eee1d9 100644 --- a/glib/gstrfuncs.c +++ b/glib/gstrfuncs.c @@ -51,7 +51,7 @@ #endif /* do not include in this place since it - * inteferes with g_strsignal() on some OSes + * interferes with g_strsignal() on some OSes */ static const guint16 ascii_table_data[256] = { @@ -183,11 +183,13 @@ g_strdup_vprintf (const gchar *format, { gchar *buffer; #ifdef HAVE_VASPRINTF - if (_g_vasprintf (&buffer, format, args1) < 0) + gint len; + len = _g_vasprintf (&buffer, format, args1); + if (len < 0) buffer = NULL; else if (!g_mem_is_system_malloc ()) { - gchar *buffer1 = g_strdup (buffer); + gchar *buffer1 = g_strndup (buffer, len); free (buffer); buffer = buffer1; } -- 2.7.4