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)
This commit is contained in:
Matthias Clasen 2006-08-30 19:06:04 +00:00 committed by Matthias Clasen
parent 8b9f7d864c
commit 4843c4b7be
2 changed files with 7 additions and 2 deletions

View File

@ -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 ===

View File

@ -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)
{
va_end (args2);
goto cleanup;
}
output2 = g_strdup_vprintf (format2->str, args2);
va_end (args2);