[arch-commits] Commit in gtk3/trunk (PKGBUILD gtkicontheme-double-free.patch)

[Jan Steffens]

    Date: Wednesday, October 16, 2013 @ 01:50:22
  Author: heftig
Revision: 196652

fix a crasher FS#37302

Added:
  gtk3/trunk/gtkicontheme-double-free.patch
Modified:
  gtk3/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   12 +++++++++---
 gtkicontheme-double-free.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-15 23:20:04 UTC (rev 196651)
+++ PKGBUILD	2013-10-15 23:50:22 UTC (rev 196652)
@@ -4,7 +4,7 @@
 
 pkgname=gtk3
 pkgver=3.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
@@ -17,10 +17,16 @@
 options=('!libtool')
 license=(LGPL)
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
-        settings.ini)
+        settings.ini gtkicontheme-double-free.patch)
 sha256sums=('c12e6897fb1ec8d8f1a6de6cd0ac1372fee6fd63ee3a5a63813dc5f3473e6ab8'
-            '14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119')
+            '14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119'
+            '587be357826a386b12758c899b8c47a7906c90585e6ddaddc848537744b36771')
 
+prepare() {
+    cd "gtk+-$pkgver"
+    patch -Np1 -i ../gtkicontheme-double-free.patch
+}
+
 build() {
     cd "gtk+-$pkgver"
 

Added: gtkicontheme-double-free.patch
===================================================================
--- gtkicontheme-double-free.patch	                        (rev 0)
+++ gtkicontheme-double-free.patch	2013-10-15 23:50:22 UTC (rev 196652)
@@ -0,0 +1,32 @@
+From a01e33e6db788bb5a3aaf310d3f64aa25c0b842a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebasti=C3=A1n=20E=2E=20Peyrott?= <pseus7 at gmail.com>
+Date: Tue, 15 Oct 2013 19:35:24 -0300
+Subject: [PATCH] Fixed double-free bug. Fixes bug 709967.
+
+---
+ gtk/gtkicontheme.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
+index fad7ff4..2be0f75 100644
+--- a/gtk/gtkicontheme.c
++++ b/gtk/gtkicontheme.c
+@@ -3873,7 +3873,14 @@ gtk_icon_info_load_icon (GtkIconInfo *icon_info,
+   if (!icon_info_ensure_scale_and_pixbuf (icon_info, FALSE))
+     {
+       if (icon_info->load_error)
+-        g_propagate_error (error, icon_info->load_error);
++        {
++          /* g_propagate_error would be wrong here as
++           * icon_info->load_error gets freed in the
++           * finalizer.
++           */
++          if (error)
++            *error = g_error_copy (icon_info->load_error);
++        }
+       else
+         g_set_error_literal (error,  
+                              GTK_ICON_THEME_ERROR,  
+-- 
+1.8.4
+