[glib: 2/2] Merge branch '1461-bookmarks-nullptr' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 4127c84c3a8461dc456cbf4c60dc98934823cec2
Merge: f424a0c2d fccef3cc8
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jul 30 18:44:48 2018 +0000

    Merge branch '1461-bookmarks-nullptr' into 'master'
    
    gmarkup: Fix crash in error handling path for closing elements
    
    Closes #1461
    
    See merge request GNOME/glib!205

 glib/gmarkup.c                      | 11 ++++++++---
 glib/tests/Makefile.am              |  1 +
 glib/tests/markups/fail-51.expected |  1 +
 glib/tests/markups/fail-51.gmarkup  |  1 +
 4 files changed, 11 insertions(+), 3 deletions(-)
---