diff --git a/ChangeLog b/ChangeLog
index bc470f82d..977970a88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +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)
+
 	* Bump version
 
 	* === Released 2.12.3 ===
diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index af777de31..53fa57ec9 100644
--- 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);