rpms/gvfs/F-12 gvfs-1.5.2-trash-finalize.patch, NONE, 1.1 gvfs.spec, 1.177, 1.178

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9129

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-1.5.2-trash-finalize.patch 
Log Message:
* Tue Jan 19 2010 Tomas Bzatek <tbzatek at redhat.com> - 1.4.3-3
- Avoid crash on race to mount gvfstrash (#555337)


gvfs-1.5.2-trash-finalize.patch:
 trashwatcher.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE gvfs-1.5.2-trash-finalize.patch ---
>From d618141ea5161d05e388e9fbfa4148a6abd976b1 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Mon, 18 Jan 2010 12:48:08 +0000
Subject: Avoid crash on race to mount gvfstrash

If the trash is already mounted (due to e.g. a race) when registering the
new trash backend we error out and free the trash backend. This caused
the g_assert_not_reached() in trash_watcher_free to hit.
---
diff --git a/daemon/trashlib/trashwatcher.c b/daemon/trashlib/trashwatcher.c
index a2cabfd..9661ce4 100644
--- a/daemon/trashlib/trashwatcher.c
+++ b/daemon/trashlib/trashwatcher.c
@@ -280,7 +280,10 @@ trash_watcher_new (TrashRoot *root)
 void
 trash_watcher_free (TrashWatcher *watcher)
 {
-  g_assert_not_reached ();
+  /* We just leak everything here, as this is not normally hit.
+     This used to be a g_assert_not_reached(), and that got hit when
+     mounting the trash backend failed due to the trash already being
+     mounted. */
 }
 
 void
--
cgit v0.8.3.1


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-12/gvfs.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -p -r1.177 -r1.178
--- gvfs.spec	12 Jan 2010 14:26:35 -0000	1.177
+++ gvfs.spec	19 Jan 2010 14:15:08 -0000	1.178
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -46,6 +46,7 @@ Patch14: gvfs-1.5.1-dont-leak-mountopera
 Patch15: gvfs-1.5.1-gphoto2-no-storageinfo-support.patch
 # from upstream
 Patch16: gvfs-1.5.1-obexftp-dbus-private-connection.patch
+Patch17: gvfs-1.5.2-trash-finalize.patch
 
 
 Obsoletes: gnome-mount <= 0.8
@@ -149,6 +150,7 @@ and iPod Touches to applications using g
 %patch14 -p1 -b .moutop-leak
 %patch15 -p1 -b .gphoto2-storageinfo
 %patch16 -p1 -b .obexftp-dbus
+%patch17 -p1 -b .trash-finalize
 
 %build
 
@@ -314,6 +316,9 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Tue Jan 19 2010 Tomas Bzatek <tbzatek at redhat.com> - 1.4.3-3
+- Avoid crash on race to mount gvfstrash (#555337)
+
 * Tue Jan 12 2010 Tomas Bzatek <tbzatek at redhat.com> - 1.4.3-2
 - Don't leak mount job operation (#552842)
 - Recognize gphoto2 cameras which don't implement get storageinfo (#552856)