[glib/glib-2-58: 21/21] Merge branch '1582-backport-411-422-ossfuzz-fixes-glib-2-58' into 'glib-2-58'
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/glib-2-58: 21/21] Merge branch '1582-backport-411-422-ossfuzz-fixes-glib-2-58' into 'glib-2-58'
- Date: Tue, 6 Nov 2018 13:11:35 +0000 (UTC)
commit 5cc59cc63220133ab78efb5e7ded69e017931f9e
Merge: 4d2405dc7 0c3db3170
Author: Philip Withnall <philip tecnocode co uk>
Date: Tue Nov 6 13:09:30 2018 +0000
Merge branch '1582-backport-411-422-ossfuzz-fixes-glib-2-58' into 'glib-2-58'
Resolve "Backport GMarkup/GVariant/GDBus fixes to glib-2-58 and glib-2-56" (glib-2-58)
See merge request GNOME/glib!447
docs/reference/glib/glib-sections.txt | 1 +
gio/gdbusmessage.c | 34 ++++-
gio/glocalfileinfo.c | 2 +-
gio/tests/gdbus-serialization.c | 196 +++++++++++++++++++-----
glib/giochannel.c | 3 +-
glib/gmarkup.c | 41 +++--
glib/gunicodeprivate.h | 5 +
glib/gutf8.c | 43 +++++-
glib/gvariant-core.c | 46 +++++-
glib/gvariant-internal.h | 18 +++
glib/gvariant-serialiser.c | 67 ++++++--
glib/gvariant-serialiser.h | 1 +
glib/gvarianttype.c | 137 ++++++++++++-----
glib/gvarianttype.h | 2 +
glib/gvarianttypeinfo.c | 25 +++
glib/gvarianttypeinfo.h | 2 +
glib/tests/Makefile.am | 2 +-
glib/tests/gvariant.c | 277 ++++++++++++++++++++++++++++++++++
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 +
23 files changed, 864 insertions(+), 172 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]