[rpms/gnome-user-share] wip/oholy/f45-update: - Fix crasher on exit when ObexFTP isn't started (#533977)

[rpms/gnome-user-share] wip/oholy/f45-update: - Fix crasher on exit when ObexFTP isn't started (#533977)

[Bastien Nocera]

A new commit has been pushed.

Repo   : rpms/gnome-user-share
Branch : wip/oholy/f45-update
Commit : 44bcbe8ea929e6edcb33cded7e17f0a5b4c97cd5
Author : Bastien Nocera <hadess@fedoraproject.org>
Date   : 2009-11-10T16:46:55+00:00
Stats  : +43/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/gnome-user-share/c/44bcbe8ea929e6edcb33cded7e17f0a5b4c97cd5?branch=wip/oholy/f45-update

Log:
- Fix crasher on exit when ObexFTP isn't started (#533977)

---
diff --git a/0001-Avoid-crashing-when-dbus_g_proxy_call-fails-but-with.patch b/0001-Avoid-crashing-when-dbus_g_proxy_call-fails-but-with.patch
new file mode 100644
index 0000000..3f96dbd
--- /dev/null
+++ b/0001-Avoid-crashing-when-dbus_g_proxy_call-fails-but-with.patch
@@ -0,0 +1,36 @@
+From f26dd4a7ebed90d81a942f0a3cae8d741bbb4ef4 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 10 Nov 2009 16:27:13 +0000
+Subject: [PATCH] Avoid crashing when dbus_g_proxy_call() fails but without an error
+
+See https://bugzilla.redhat.com/show_bug.cgi?id=533977
+---
+ src/obexftp.c |   11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/obexftp.c b/src/obexftp.c
+index 02e8956..1037a10 100644
+--- a/src/obexftp.c
++++ b/src/obexftp.c
+@@ -110,11 +110,14 @@ obexftp_stop (gboolean stop_manager)
+ 		return;
+ 
+ 	if (dbus_g_proxy_call (server_proxy, "Close", &err, G_TYPE_INVALID, G_TYPE_INVALID) == FALSE) {
+-		if (g_error_matches (err, DBUS_GERROR, DBUS_GERROR_REMOTE_EXCEPTION) == FALSE ||
++		if (err == NULL ||
++		    g_error_matches (err, DBUS_GERROR, DBUS_GERROR_REMOTE_EXCEPTION) == FALSE ||
+ 		    dbus_g_error_has_name (err, "org.openobex.Error.NotStarted") == FALSE) {
+-			g_printerr ("Stopping Bluetooth ObexFTP server failed: %s\n",
+-				    err->message);
+-			g_error_free (err);
++			if (err != NULL) {
++				g_printerr ("Stopping Bluetooth ObexFTP server failed: %s\n",
++					    err->message);
++				g_error_free (err);
++			}
+ 			return;
+ 		}
+ 		g_error_free (err);
+-- 
+1.6.5.2
+

diff --git a/gnome-user-share.spec b/gnome-user-share.spec
index 61b118b..f7f85c6 100644
--- a/gnome-user-share.spec
+++ b/gnome-user-share.spec
@@ -1,7 +1,7 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 2.28.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
@@ -14,6 +14,8 @@ Patch1: 0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch
 %define		_default_patch_fuzz 2
 Patch2: 0001-Use-same-directories-in-nautilus-bar-and-app.patch
 BuildRequires: intltool automake autoconf libtool
+# https://bugzilla.redhat.com/show_bug.cgi?id=533977
+Patch3: 0001-Avoid-crashing-when-dbus_g_proxy_call-fails-but-with.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,6 +60,7 @@ The program also allows to share files using ObexFTP over Bluetooth.
 %patch0 -p1 -b .menu-path
 %patch1 -p1 -b .cluebar
 %patch2 -p1 -b .dirs
+%patch3 -p1 -b .exit-crash
 
 autoreconf -f -i
 
@@ -140,6 +143,9 @@ fi
 %{_libdir}/nautilus/extensions-2.0/*.so
 
 %changelog
+* Tue Nov 10 2009 Bastien Nocera <bnocera@redhat.com> 2.28.1-3
+- Fix crasher on exit when ObexFTP isn't started (#533977)
+
 * Tue Nov 03 2009 Bastien Nocera <bnocera@redhat.com> 2.28.1-2
 - Update share bar code to use the same directories as
   the sharing code itself