Don't call va_end on caller-provided va_args. (#353584, Chris Wilson)

2006-08-30  Matthias Clasen  <mclasen@redhat.com>

	* glib/gmarkup.c (g_markup_vprintf_escaped): Don't call
	va_end on caller-provided va_args.  (#353584, Chris Wilson)

diff --git a/ChangeLog b/ChangeLog
index ab957b9..db7e4ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-30  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gmarkup.c (g_markup_vprintf_escaped): Don't call
+       va_end on caller-provided va_args.  (#353584, Chris Wilson)
+
 2006-08-29  Tor Lillqvist  <tml@novell.com>
 
        Remove support for Windows 9x/ME, as will be done also in Pango

diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index af777de..53fa57e 100644 (file)
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -2172,9 +2172,11 @@ g_markup_vprintf_escaped (const char *format,
   G_VA_COPY (args2, args);
   
   output1 = g_strdup_vprintf (format1->str, args);
-  va_end (args);
   if (!output1)
-    goto cleanup;
+    {
+      va_end (args2);
+      goto cleanup;
+    }
   
   output2 = g_strdup_vprintf (format2->str, args2);
   va_end (args2);