[glib/glib-2-56: 3/3] Merge branch 'markup-cve-fixes-2-56' into 'glib-2-56'

[Philip Withnall <pwithnall src gnome org>]

commit d188851253bd79e8ee6fb950113a4092c29bfee4
Merge: 5716eeaca c008d2c43
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri Sep 7 11:34:19 2018 +0000

    Merge branch 'markup-cve-fixes-2-56' into 'glib-2-56'
    
    Backport gmarkup fixes to 2.56
    
    See merge request GNOME/glib!307

 glib/gmarkup.c                      | 25 +++++++++++++++++++++----
 glib/tests/Makefile.am              |  3 ++-
 glib/tests/markups/fail-50.expected |  1 +
 glib/tests/markups/fail-50.gmarkup  |  1 +
 glib/tests/markups/fail-51.expected |  1 +
 glib/tests/markups/fail-51.gmarkup  |  1 +
 6 files changed, 27 insertions(+), 5 deletions(-)
---