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

Merge branch 'backport-945-markup-stack-overrun-glib-2-60' into 'glib-2-60'

Browse Source 
Backport !945 “Avoid overrunning stack at the end of the varargs.” to glib-2-60

See merge request GNOME/glib!949
This commit is contained in:
Emmanuele Bassi 2019-07-09 10:42:08 +00:00
commit de4d107744
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glib/gmarkup.c
View File

@ -2872,9 +2872,10 @@ g_markup_collect_attributes (const gchar *element_name,
g_assert_not_reached (); g_assert_not_reached ();
} }
type = va_arg (ap, GMarkupCollectType);
attr = va_arg (ap, const char *);
written++; written++;
type = va_arg (ap, GMarkupCollectType);
if (type != G_MARKUP_COLLECT_INVALID)
attr = va_arg (ap, const char *);
} }
va_end (ap); va_end (ap);
@ -2950,7 +2951,8 @@ failure:
} }
type = va_arg (ap, GMarkupCollectType); type = va_arg (ap, GMarkupCollectType);
attr = va_arg (ap, const char *); if (type != G_MARKUP_COLLECT_INVALID)
attr = va_arg (ap, const char *);
} }
va_end (ap); va_end (ap);