[glib2/f18] - Fix dconf-service crasher

[Ray Strode]

commit 7d2554d777c6d35bc2b6bb00c6ec9d090679f2f1
Author: Ray Strode <rstrode at redhat.com>
Date:   Fri Jan 18 17:02:43 2013 -0500

    - Fix dconf-service crasher
    
    Resolves: #789824

 fix-dconf-service.patch |   62 +++++++++++++++++++++++++++++++++++++++++++++++
 glib2.spec              |    8 +++++-
 2 files changed, 69 insertions(+), 1 deletions(-)
---
diff --git a/fix-dconf-service.patch b/fix-dconf-service.patch
new file mode 100644
index 0000000..9a12d7c
--- /dev/null
+++ b/fix-dconf-service.patch
@@ -0,0 +1,62 @@
+From 998c6e65cf18aee626b9982347c29b4b09f2c097 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt at desrt.ca>
+Date: Fri, 18 Jan 2013 21:11:20 +0000
+Subject: GVariant: fix normal-form checking for tuples
+
+GVariant has the concept of fixed-sized types (ie: types for which all
+values of the type will have the same size).  Examples are booleans,
+integers, doubles, etc.  Tuples containing only these types are also
+fixed size.
+
+When GVariant is trying to deal with a fixed-sized value for which it
+doesn't have a sufficient backing store (eg: the case where a
+fixed-sized value was created with g_variant_new_data() with an
+incorrect number of bytes) it denotes this by setting the size of the
+value to the correct fixed size but using a NULL data pointer.
+
+This is well-documented in several code comments and also in the public
+API documentation for g_variant_get_data() which describes the situation
+number which NULL could be returned.
+
+The decision to deal with this case in this way was changed at the last
+minute around the time that GVariant was merged -- originally we had an
+elaborate setup involving allocating an internal buffer of sufficient
+size to be shared between all invalid values.
+
+Unfortunately, when making this change a small detail was missed.
+gvs_tuple_get_child() (the function responsible for deserialising
+tuples) was updated to properly check for this case (and it contains a
+comment about why it must).  gvs_tuple_is_normal() (the function
+responsible for verifying if a tuple is in normal form) was not.
+
+We add the check now.
+
+Note that this problem does not exist with any other container type
+because tuples are the only container capable of being fixed-sized.  All
+other container types (arrays, maybes, variants) can contain a variable
+number of items or items of variable types (note: we consider dictionary
+entries to be two-tuples).  The code for validating non-container values
+also contains a check for the case of NULL data.
+
+The problem also does not occur in the only other function dealing with
+serialised tuples: gvs_tuple_n_children().  Whereas other container
+types would have to inspect the serialised data to determine the number
+of children, for tuples it can be determined directly from the type.
+---
+diff --git a/glib/gvariant-serialiser.c b/glib/gvariant-serialiser.c
+index 4ee6c72..cc5cc7b 100644
+--- a/glib/gvariant-serialiser.c
++++ b/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;
+--
+cgit v0.9.0.2
diff --git a/glib2.spec b/glib2.spec
index 6d00268..bef53c2 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -1,7 +1,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.34.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -9,6 +9,7 @@ URL: http://www.gtk.org
 Source: http://download.gnome.org/sources/glib/2.34/glib-%{version}.tar.xz
 
 Patch0: codegen-in-datadir.patch
+Patch1: fix-dconf-service.patch
 
 BuildRequires: pkgconfig
 BuildRequires: gamin-devel
@@ -59,6 +60,7 @@ The glib2-doc package includes documentation for the GLib library.
 %prep
 %setup -q -n glib-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 # Rerun autotools for the above patch
@@ -180,6 +182,10 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
 %doc %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Jan 18 2013 Ray Strode <rstrode at redhat.com> 2.34.2-2
+- Fix dconf-service crasher
+  Resolves: #789824
+
 * Mon Nov 12 2012 Kalev Lember <kalevlember at gmail.com> - 2.34.2-1
 - Update to 2.34.2