Fix #147651, reported by Oliver Guntermann:

2004-07-21  Matthias Clasen  <mclasen@redhat.com>

	Fix #147651, reported by Oliver Guntermann:

	* glib/gprintfint.h (_g_vasprintf): Don't wrap vasprintf(),
	_g_gnulib_vasprintf() in a macro, since they behave
	differently wrt. to memory allocation.

	* glib/gprintf.c (g_vasprintf): Instead, differentiate
	here between the three cases: system vasprintf(),
	_g_gnulib_vasprintf(), no vasprintf().

diff --git a/ChangeLog b/ChangeLog
index 6fd8ef7..bf22bb5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-07-21  Matthias Clasen  <mclasen@redhat.com>
+
+       Fix #147651, reported by Oliver Guntermann:
+
+       * glib/gprintfint.h (_g_vasprintf): Don't wrap vasprintf(),
+       _g_gnulib_vasprintf() in a macro, since they behave 
+       differently wrt. to memory allocation.
+
+       * glib/gprintf.c (g_vasprintf): Instead, differentiate 
+       here between the three cases: system vasprintf(), 
+       _g_gnulib_vasprintf(), no vasprintf().  
+
 2004-07-20  Crispin Flowerday  <gnome@flowerday.cx>
 
        * NEWS: Fix a typo in my name

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6fd8ef7..bf22bb5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+2004-07-21  Matthias Clasen  <mclasen@redhat.com>
+
+       Fix #147651, reported by Oliver Guntermann:
+
+       * glib/gprintfint.h (_g_vasprintf): Don't wrap vasprintf(),
+       _g_gnulib_vasprintf() in a macro, since they behave 
+       differently wrt. to memory allocation.
+
+       * glib/gprintf.c (g_vasprintf): Instead, differentiate 
+       here between the three cases: system vasprintf(), 
+       _g_gnulib_vasprintf(), no vasprintf().  
+
 2004-07-20  Crispin Flowerday  <gnome@flowerday.cx>
 
        * NEWS: Fix a typo in my name

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 6fd8ef7..bf22bb5 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,15 @@
+2004-07-21  Matthias Clasen  <mclasen@redhat.com>
+
+       Fix #147651, reported by Oliver Guntermann:
+
+       * glib/gprintfint.h (_g_vasprintf): Don't wrap vasprintf(),
+       _g_gnulib_vasprintf() in a macro, since they behave 
+       differently wrt. to memory allocation.
+
+       * glib/gprintf.c (g_vasprintf): Instead, differentiate 
+       here between the three cases: system vasprintf(), 
+       _g_gnulib_vasprintf(), no vasprintf().  
+
 2004-07-20  Crispin Flowerday  <gnome@flowerday.cx>
 
        * NEWS: Fix a typo in my name

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6fd8ef7..bf22bb5 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+2004-07-21  Matthias Clasen  <mclasen@redhat.com>
+
+       Fix #147651, reported by Oliver Guntermann:
+
+       * glib/gprintfint.h (_g_vasprintf): Don't wrap vasprintf(),
+       _g_gnulib_vasprintf() in a macro, since they behave 
+       differently wrt. to memory allocation.
+
+       * glib/gprintf.c (g_vasprintf): Instead, differentiate 
+       here between the three cases: system vasprintf(), 
+       _g_gnulib_vasprintf(), no vasprintf().  
+
 2004-07-20  Crispin Flowerday  <gnome@flowerday.cx>
 
        * NEWS: Fix a typo in my name

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6fd8ef7..bf22bb5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+2004-07-21  Matthias Clasen  <mclasen@redhat.com>
+
+       Fix #147651, reported by Oliver Guntermann:
+
+       * glib/gprintfint.h (_g_vasprintf): Don't wrap vasprintf(),
+       _g_gnulib_vasprintf() in a macro, since they behave 
+       differently wrt. to memory allocation.
+
+       * glib/gprintf.c (g_vasprintf): Instead, differentiate 
+       here between the three cases: system vasprintf(), 
+       _g_gnulib_vasprintf(), no vasprintf().  
+
 2004-07-20  Crispin Flowerday  <gnome@flowerday.cx>
 
        * NEWS: Fix a typo in my name

diff --git a/glib/gprintf.c b/glib/gprintf.c
index 9b511ea..522a7f6 100644 (file)
--- a/glib/gprintf.c
+++ b/glib/gprintf.c
@@ -300,17 +300,27 @@ g_vasprintf (gchar      **string,
   gint len;
   g_return_val_if_fail (string != NULL, -1);
 
-#ifdef _g_vasprintf
-  len = _g_vasprintf (string, format, args);
+#if !defined(HAVE_GOOD_PRINTF)
+
+  len = _g_gnulib_vasprintf (string, format, args);
+  if (len < 0)
+    *string = NULL;
+
+#elif defined (HAVE_VASPRINTF)
+
+  len = vasprintf (string, format, args);
   if (len < 0)
     *string = NULL;
   else if (!g_mem_is_system_malloc ()) 
     {
+      /* vasprintf returns malloc-allocated memory */
       gchar *string1 = g_strndup (*string, len);
       free (*string);
       *string = string1;
     }
+
 #else
+
   {
     va_list args2;
 
@@ -328,3 +338,4 @@ g_vasprintf (gchar      **string,
 
 
 
+

diff --git a/glib/gprintfint.h b/glib/gprintfint.h
index 2195e6f..0c975a1 100644 (file)
--- a/glib/gprintfint.h
+++ b/glib/gprintfint.h
@@ -39,10 +39,6 @@
 #define _g_vsprintf  vsprintf
 #define _g_vsnprintf vsnprintf
 
-#ifdef HAVE_VASPRINTF
-#define _g_vasprintf vasprintf
-#endif
-
 #else
 
 #include "gnulib/printf.h"
@@ -57,8 +53,6 @@
 #define _g_vsprintf  _g_gnulib_vsprintf
 #define _g_vsnprintf _g_gnulib_vsnprintf
 
-#define _g_vasprintf _g_gnulib_vasprintf
-
 #endif
 
 #endif /* __G_PRINTF_H__ */