r30818 - in /desktop/experimental/gobject-introspection/debian: changelog patches/02_fix_unresolved_info_freeing.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Wed Oct 19 22:42:02 2011
New Revision: 30818

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30818
Log:
* debian/patches/02_fix_unresolved_info_freeing.patch:
  + Added, Fixes memory corruptions which crashes gnome-shell 3.0 (gbz 662247)

Added:
    desktop/experimental/gobject-introspection/debian/patches/02_fix_unresolved_info_freeing.patch
Modified:
    desktop/experimental/gobject-introspection/debian/changelog
    desktop/experimental/gobject-introspection/debian/patches/series

Modified: desktop/experimental/gobject-introspection/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gobject-introspection/debian/changelog?rev=30818&op=diff
==============================================================================
--- desktop/experimental/gobject-introspection/debian/changelog [utf-8] (original)
+++ desktop/experimental/gobject-introspection/debian/changelog [utf-8] Wed Oct 19 22:42:02 2011
@@ -16,8 +16,10 @@
   * debian/patches/01-account_for_padding_in_struct_size_check.patch:
     + Added, Account for padding in struct size check (From ubuntu package &
       upstream git)
-
- -- Sjoerd Simons <sjoerd at debian.org>  Mon, 17 Oct 2011 13:48:07 +0100
+  * debian/patches/02_fix_unresolved_info_freeing.patch:
+    + Added, Fixes memory corruptions which crashes gnome-shell 3.0 (gbz 662247)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Wed, 19 Oct 2011 23:39:38 +0100
 
 gobject-introspection (0.10.8-2) unstable; urgency=low
 

Added: desktop/experimental/gobject-introspection/debian/patches/02_fix_unresolved_info_freeing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gobject-introspection/debian/patches/02_fix_unresolved_info_freeing.patch?rev=30818&op=file
==============================================================================
--- desktop/experimental/gobject-introspection/debian/patches/02_fix_unresolved_info_freeing.patch (added)
+++ desktop/experimental/gobject-introspection/debian/patches/02_fix_unresolved_info_freeing.patch [utf-8] Wed Oct 19 22:42:02 2011
@@ -1,0 +1,32 @@
+From 022841f9ba4fa5d1eb0d8210651e8bd511ab28f6 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+Date: Wed, 19 Oct 2011 23:26:35 +0100
+Subject: [PATCH] Use the correct size when freeing unused info
+
+A GIBaseInfo struct can underneath either be GIRealInfo *or*
+GIUnresolvedInfo if the type is GI_INFO_TYPE_UNRESOLVED. So when we
+eventually free the structures slice use the correct struct type
+otherwise things get unhappy.
+---
+ girepository/gibaseinfo.c |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/girepository/gibaseinfo.c b/girepository/gibaseinfo.c
+index bfb7743..48af5c2 100644
+--- a/girepository/gibaseinfo.c
++++ b/girepository/gibaseinfo.c
+@@ -253,7 +253,10 @@ g_base_info_unref (GIBaseInfo *info)
+       if (rinfo->repository)
+         g_object_unref (rinfo->repository);
+ 
+-      g_slice_free (GIRealInfo, rinfo);
++      if (rinfo->type == GI_INFO_TYPE_UNRESOLVED)
++        g_slice_free (GIUnresolvedInfo, rinfo);
++      else
++        g_slice_free (GIRealInfo, rinfo);
+     }
+ }
+ 
+-- 
+1.7.7
+

Modified: desktop/experimental/gobject-introspection/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gobject-introspection/debian/patches/series?rev=30818&op=diff
==============================================================================
--- desktop/experimental/gobject-introspection/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gobject-introspection/debian/patches/series [utf-8] Wed Oct 19 22:42:02 2011
@@ -1,1 +1,2 @@
 01-account_for_padding_in_struct_size_check.patch
+02_fix_unresolved_info_freeing.patch