Accepting request 341519 from GNOME:Factory

1

OBS-URL: https://build.opensuse.org/request/show/341519
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk3?expand=0&rev=86

gtk3-places-sidebar-no-crash.patch

@@ -0,0 +1,29 @@
+From 37cc6358557d5aa9ebd0b986af17a837d6a94aca Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Thu, 29 Oct 2015 13:56:18 +0100
+Subject: [PATCH] placessidebar: do not crash if uris is NULL
+
+On Drag'n'Drop actions across system boundaries (VM host to gues), the
+happen to be null.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=757298
+---
+ gtk/gtkplacessidebar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
+index 42179c3..8dc6d30 100644
+--- a/gtk/gtkplacessidebar.c
++++ b/gtk/gtkplacessidebar.c
+@@ -1708,7 +1708,7 @@ build_file_list_from_uris (const gchar **uris)
+   gint i;
+ 
+   result = NULL;
+-  for (i = 0; uris[i]; i++)
++  for (i = 0; uris && uris[i]; i++)
+     {
+       GFile *file;
+ 
+-- 
+2.6.0
+

gtk3.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Oct 29 12:59:43 UTC 2015 - dimstar@opensuse.org
+
+- Add gtk3-places-sidebar-no-crash.patch: Do not crash if dragging
+  something over the places sidebar, that has no valid URI (mostly
+  coming from a host system into a guest system) (boo#952356,
+  bgo#757298).
+
 -------------------------------------------------------------------
 Mon Oct 12 19:19:57 UTC 2015 - zaitor@opensuse.org
 

gtk3.spec

@@ -47,6 +47,8 @@ Patch1:         gtk3-path-local.patch
 ## PATCH-DISABLED gtk3-bnc130159-bgo319483-async-font-selection.patch - Upstream bug was closed as obsolete in 2011, lets see if anyone complains. 
 # PATCH-FIX-UPSTREAM gtk3-bnc130159-bgo319483-async-font-selection.patch bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages
 Patch3:         gtk3-bnc130159-bgo319483-async-font-selection.patch
+# PATCH-FIX-UPSTREAM gtk3-places-sidebar-no-crash.patch boo#952356 bgo#757298 dimstar@opensuse.org -- Don't crash when dragging files from host to guest over sidebar
+Patch4:         gtk3-places-sidebar-no-crash.patch
 BuildRequires:  cups-devel >= 1.2
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
@@ -338,6 +340,7 @@ cp -a %{S:1} .
 %patch1 -p0
 ## PATCH-DISABLED - Upstream bug was closed as obsolete in 2011, as there was a new fontchooser, lets disable the patch and see if anyone complains.
 #%%patch3 -p1
+%patch4 -p1
 
 %build
 # Needed for patch1 and patch4