[glib: 2/2] Merge branch 'ossfuzz-12960-markup-attribute-limit' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit a902addf6da43252fa9055226d8b6aca52e29487
Merge: 4170528bd 57fc0be85
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Sep 24 13:19:35 2019 +0000

    Merge branch 'ossfuzz-12960-markup-attribute-limit' into 'master'
    
    gmarkup: Add a limit on the number of attributes in an element
    
    See merge request GNOME/glib!1116

 glib/gmarkup.c                      | 18 ++++++++++++++++--
 glib/tests/markups/fail-54.expected |  1 +
 glib/tests/markups/fail-54.gmarkup  |  1 +
 3 files changed, 18 insertions(+), 2 deletions(-)
---