rpms/gvfs/F-12 obex-crasher.patch,NONE,1.1 gvfs.spec,1.161,1.162

[Bastien Nocera]

Author: hadess

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

Modified Files:
	gvfs.spec 
Added Files:
	obex-crasher.patch 
Log Message:
* Wed Oct 14 2009 Bastien Nocera <bnocera at redhat.com> 1.4.0-6
- Fix crasher in ObexFTP (#528181)


obex-crasher.patch:
 gvfsbackendobexftp.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE obex-crasher.patch ---
commit 59a657175301c5b99bce0ce9a53b14efc202eb8e
Author: Bastien Nocera <hadess at hadess.net>
Date:   Wed Oct 14 14:27:43 2009 +0100

    Fix crasher in obexftp backend
    
    Spotted by Matthias Clasen
    
    See https://bugzilla.redhat.com/show_bug.cgi?id=528181

diff --git a/daemon/gvfsbackendobexftp.c b/daemon/gvfsbackendobexftp.c
index e658b16..84969db 100644
--- a/daemon/gvfsbackendobexftp.c
+++ b/daemon/gvfsbackendobexftp.c
@@ -1816,6 +1816,7 @@ do_push (GVfsBackend *backend,
       push_data_free (job_data);
 
       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+      return;
     }
 
   push_data_free (job_data);


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/F-12/gvfs.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- gvfs.spec	9 Oct 2009 14:59:18 -0000	1.161
+++ gvfs.spec	14 Oct 2009 13:38:18 -0000	1.162
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.4.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -53,6 +53,8 @@ Patch7: gvfs-1.4.1-no-poll-for-media.pat
 Patch8: 0001-Disallow-mounting-empty-drives.patch
 Patch9: 0002-Disallow-ejecting-empty-drives.patch
 Patch10: 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=528181
+Patch11: obex-crasher.patch
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -155,6 +157,7 @@ and iPod Touches to applications using g
 %patch8 -p1 -b .mount-empty
 %patch9 -p1 -b .eject-empty
 %patch10 -p1 -b .error-detaching
+%patch11 -p1 -b .push-fail
 
 %build
 
@@ -308,6 +311,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Wed Oct 14 2009 Bastien Nocera <bnocera at redhat.com> 1.4.0-6
+- Fix crasher in ObexFTP (#528181)
+
 * Fri Oct  9 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-5
 - Don't always overwrite on trash restore
 - Separate "Safely Remove Drive" from "Eject"