From 75f13548eae1827c71d045ba41ab0348aea188a6 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 26 Sep 2001 16:42:10 +0000 Subject: [PATCH] Copy if !g_mem_is_system_malloc, not the other way around. (Found by James Wed Sep 26 12:41:05 2001 Owen Taylor * glib/gstrfuncs.c (g_strdup_vprintf): Copy if !g_mem_is_system_malloc, not the other way around. (Found by James Antill.) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib/gstrfuncs.c | 2 +- 9 files changed, 49 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bf060ee4..09057efa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Sep 26 12:41:05 2001 Owen Taylor + + * glib/gstrfuncs.c (g_strdup_vprintf): Copy if + !g_mem_is_system_malloc, not the other way around. + (Found by James Antill.) + Wed Sep 26 11:00:31 2001 Owen Taylor * glib/gstrfuncs.c (g_strnfill): Use memset; might be diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index bf060ee4..09057efa 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Wed Sep 26 12:41:05 2001 Owen Taylor + + * glib/gstrfuncs.c (g_strdup_vprintf): Copy if + !g_mem_is_system_malloc, not the other way around. + (Found by James Antill.) + Wed Sep 26 11:00:31 2001 Owen Taylor * glib/gstrfuncs.c (g_strnfill): Use memset; might be diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bf060ee4..09057efa 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed Sep 26 12:41:05 2001 Owen Taylor + + * glib/gstrfuncs.c (g_strdup_vprintf): Copy if + !g_mem_is_system_malloc, not the other way around. + (Found by James Antill.) + Wed Sep 26 11:00:31 2001 Owen Taylor * glib/gstrfuncs.c (g_strnfill): Use memset; might be diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index bf060ee4..09057efa 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Wed Sep 26 12:41:05 2001 Owen Taylor + + * glib/gstrfuncs.c (g_strdup_vprintf): Copy if + !g_mem_is_system_malloc, not the other way around. + (Found by James Antill.) + Wed Sep 26 11:00:31 2001 Owen Taylor * glib/gstrfuncs.c (g_strnfill): Use memset; might be diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bf060ee4..09057efa 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Wed Sep 26 12:41:05 2001 Owen Taylor + + * glib/gstrfuncs.c (g_strdup_vprintf): Copy if + !g_mem_is_system_malloc, not the other way around. + (Found by James Antill.) + Wed Sep 26 11:00:31 2001 Owen Taylor * glib/gstrfuncs.c (g_strnfill): Use memset; might be diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bf060ee4..09057efa 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Wed Sep 26 12:41:05 2001 Owen Taylor + + * glib/gstrfuncs.c (g_strdup_vprintf): Copy if + !g_mem_is_system_malloc, not the other way around. + (Found by James Antill.) + Wed Sep 26 11:00:31 2001 Owen Taylor * glib/gstrfuncs.c (g_strnfill): Use memset; might be diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bf060ee4..09057efa 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed Sep 26 12:41:05 2001 Owen Taylor + + * glib/gstrfuncs.c (g_strdup_vprintf): Copy if + !g_mem_is_system_malloc, not the other way around. + (Found by James Antill.) + Wed Sep 26 11:00:31 2001 Owen Taylor * glib/gstrfuncs.c (g_strnfill): Use memset; might be diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bf060ee4..09057efa 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed Sep 26 12:41:05 2001 Owen Taylor + + * glib/gstrfuncs.c (g_strdup_vprintf): Copy if + !g_mem_is_system_malloc, not the other way around. + (Found by James Antill.) + Wed Sep 26 11:00:31 2001 Owen Taylor * glib/gstrfuncs.c (g_strnfill): Use memset; might be diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c index 5f2b4cef..d0181d10 100644 --- a/glib/gstrfuncs.c +++ b/glib/gstrfuncs.c @@ -183,7 +183,7 @@ g_strdup_vprintf (const gchar *format, gchar *buffer; #ifdef HAVE_VASPRINTF vasprintf (&buffer, format, args1); - if (g_mem_is_system_malloc ()) + if (!g_mem_is_system_malloc ()) { gchar *buffer1 = g_strdup (buffer); free (buffer); -- 2.34.1