luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-26 04:02:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix cleanup in g_markup_collect

Browse Source 
Patch by Matt Barnes,
https://bugzilla.gnome.org/show_bug.cgi?id=644428
This commit is contained in:
Matthias Clasen 2011-03-10 23:27:49 -05:00
parent 949b7c3428
commit a6615ba859
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
glib/gmarkup.c
View File

@ -2794,33 +2794,30 @@ failure:
ptr = va_arg (ap, gpointer); ptr = va_arg (ap, gpointer);
if (ptr == NULL) if (ptr != NULL)
continue;
switch (type & (G_MARKUP_COLLECT_OPTIONAL - 1))
{ {
case G_MARKUP_COLLECT_STRDUP: switch (type & (G_MARKUP_COLLECT_OPTIONAL - 1))
if (written) {
g_free (*(char **) ptr); case G_MARKUP_COLLECT_STRDUP:
if (written)
g_free (*(char **) ptr);
case G_MARKUP_COLLECT_STRING: case G_MARKUP_COLLECT_STRING:
*(char **) ptr = NULL; *(char **) ptr = NULL;
break; break;
case G_MARKUP_COLLECT_BOOLEAN: case G_MARKUP_COLLECT_BOOLEAN:
*(gboolean *) ptr = FALSE; *(gboolean *) ptr = FALSE;
break; break;
case G_MARKUP_COLLECT_TRISTATE: case G_MARKUP_COLLECT_TRISTATE:
*(gboolean *) ptr = -1; *(gboolean *) ptr = -1;
break; break;
}
} }
type = va_arg (ap, GMarkupCollectType); type = va_arg (ap, GMarkupCollectType);
attr = va_arg (ap, const char *); attr = va_arg (ap, const char *);
if (written)
written--;
} }
va_end (ap); va_end (ap);