[glib: 2/2] Merge branch '1462-bookmark-overflow' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit f424a0c2d32d2648be4e4c24d105a1d6369303cb
Merge: b5b0485bf cec717054
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jul 30 17:56:21 2018 +0000

    Merge branch '1462-bookmark-overflow' into 'master'
    
    gmarkup: Fix unvalidated UTF-8 read in markup parsing error paths
    
    Closes #1462
    
    See merge request GNOME/glib!204

 glib/gmarkup.c                      | 14 +++++++++++++-
 glib/tests/Makefile.am              |  2 +-
 glib/tests/markups/fail-50.expected |  1 +
 glib/tests/markups/fail-50.gmarkup  |  1 +
 4 files changed, 16 insertions(+), 2 deletions(-)
---