[glib: 6/6] Merge branch 'ossfuzz-9672-markup-overflow' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit c2501a81f801d65a6c3c3c91a85f6210a740a3cb
Merge: 89ee8bfde 1a7f07f6b
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Oct 29 22:03:05 2018 +0000

    Merge branch 'ossfuzz-9672-markup-overflow' into 'master'
    
    GMarkup buffer overflow fixes for error handling, round 2
    
    See merge request GNOME/glib!422

 glib/gmarkup.c                      |  36 ++++++----
 glib/tests/Makefile.am              |   2 +-
 glib/tests/markup-parse.c           | 129 ++++++++++++++++++------------------
 glib/tests/markups/fail-52.expected |   1 +
 glib/tests/markups/fail-52.gmarkup  |   1 +
 glib/tests/markups/fail-53.expected |   2 +
 glib/tests/markups/fail-53.gmarkup  |   1 +
 7 files changed, 95 insertions(+), 77 deletions(-)
---