From c699743eca5dde1430d0cd31292a725ded78ded1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 30 Aug 2006 19:07:54 +0000 Subject: [PATCH] Don't call va_end on caller-provided va_args. (#353584, Chris Wilson) 2006-08-30 Matthias Clasen * glib/gmarkup.c (g_markup_vprintf_escaped): Don't call va_end on caller-provided va_args. (#353584, Chris Wilson) --- ChangeLog | 5 +++++ glib/gmarkup.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab957b9..db7e4ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-08-30 Matthias Clasen + + * 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 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 --- 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); -- 2.7.4