rpms/gvfs/F-11 obex-crasher.patch,NONE,1.1 gvfs.spec,1.143,1.144

[Bastien Nocera]

Author: hadess

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

Modified Files:
	gvfs.spec 
Added Files:
	obex-crasher.patch 
Log Message:
* Wed Oct 14 2009 Bastien Nocera <bnocera at redhat.com> 1.2.3-13
- Fix ObexFTP push crasher (#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-11/gvfs.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- gvfs.spec	19 Aug 2009 15:08:47 -0000	1.143
+++ gvfs.spec	14 Oct 2009 13:45:43 -0000	1.144
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.2.3
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -46,6 +46,8 @@ Patch6: gvfs-1.3.4-smb-browse-fake-conte
 # nautilus can't create "unamed folder X" if it exist on the target via sftp
 # https://bugzilla.redhat.com/show_bug.cgi?id=512611
 Patch8: gvfs-1.3.5-mkdir-exists-error.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=528181
+Patch9: obex-crasher.patch
 
 # Gdu volume monitor patches, from http://cgit.freedesktop.org/~david/gvfs/log/?h=gdu-volume-monitor
 #
@@ -192,6 +194,7 @@ media players (Media Transfer Protocol) 
 %patch5 -p1 -b .sftp-timeout
 %patch6 -p1 -b .smb-fake-content-type
 %patch8 -p1 -b .sftp-mkdir
+%patch9 -p1 -b .push-fail
 
 %patch101 -p1 -b .gdu-volume-monitor
 %patch102 -p1 -b .gdu-volumes-typo
@@ -361,6 +364,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Wed Oct 14 2009 Bastien Nocera <bnocera at redhat.com> 1.2.3-13
+- Fix ObexFTP push crasher (#528181)
+
 * Wed Aug 19 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-12
 - Fix remaining mount prefix issues (#509612)