diff options
author | Dan Nicholson <dbn.lists@gmail.com> | 2014-02-03 15:41:27 -0800 |
---|---|---|
committer | Dan Nicholson <dbn.lists@gmail.com> | 2014-02-03 15:41:27 -0800 |
commit | 90320817dc06052de780b406ad74db22845835ba (patch) | |
tree | ae82c1f24b63dac48c60110819da8e0707202d30 /glib/glib/gvariant-serialiser.c | |
parent | e1d44d2362061a4cbd002ce059f1ac9dd78d971a (diff) | |
download | pkg-config-90320817dc06052de780b406ad74db22845835ba.tar.gz |
glib: Update snapshot version to 2.38.2
This is the latest stable release from upstream. Patches have been
refreshed, including putting the removal of most pkg-config checks into
the glib-only patch. A few more files, most notably the large NEWS file,
have also been removed from the repo to keep the size of the snapshot
down.
Diffstat (limited to 'glib/glib/gvariant-serialiser.c')
-rw-r--r-- | glib/glib/gvariant-serialiser.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/glib/glib/gvariant-serialiser.c b/glib/glib/gvariant-serialiser.c index 4ee6c72..cc5cc7b 100644 --- a/glib/glib/gvariant-serialiser.c +++ b/glib/glib/gvariant-serialiser.c @@ -1023,6 +1023,10 @@ gvs_tuple_is_normal (GVariantSerialised value) gsize offset; gsize i; + /* as per the comment in gvs_tuple_get_child() */ + if G_UNLIKELY (value.data == NULL && value.size != 0) + return FALSE; + offset_size = gvs_get_offset_size (value.size); length = g_variant_type_info_n_members (value.type_info); offset_ptr = value.size; |