[glib: 2/2] Merge branch 'ossfuzz-11578-variant-text-type-detection' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 5c97cf666d85780e884a4b1363054af924e49ca2
Merge: d05466753 c927c59a8
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Feb 26 14:19:08 2019 +0000

    Merge branch 'ossfuzz-11578-variant-text-type-detection' into 'master'
    
    gvariant-parser: Fix error handling when type coalescing fails
    
    See merge request GNOME/glib!639

 glib/gvariant-parser.c | 28 ++++++++++++++++++++++++++--
 glib/tests/gvariant.c  |  1 +
 2 files changed, 27 insertions(+), 2 deletions(-)
---