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

Merge branch 'fix-stack-overrun' into 'master'

Browse Source 
Avoid overrunning stack at the end of the varargs.

See merge request GNOME/glib!945
This commit is contained in:
Philip Withnall 2019-06-24 13:27:33 +00:00
commit bd5922db09
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 ();
}
type = va_arg (ap, GMarkupCollectType);
attr = va_arg (ap, const char *);
written++;
type = va_arg (ap, GMarkupCollectType);
if (type != G_MARKUP_COLLECT_INVALID)
attr = va_arg (ap, const char *);
}
va_end (ap);
@ -2950,7 +2951,8 @@ failure:
}
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);