rpms/nautilus-sendto/F-12 0001-Fix-possible-crasher-in-Bluetooth-plugin.patch, NONE, 1.1 nautilus-sendto.spec, 1.89, 1.90

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/nautilus-sendto/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31458

Modified Files:
	nautilus-sendto.spec 
Added Files:
	0001-Fix-possible-crasher-in-Bluetooth-plugin.patch 
Log Message:
* Thu Jan 21 2010 Bastien Nocera <bnocera at redhat.com> 2.28.2-2
- Fix possible crasher when dbus_g_proxy_call() fails but
  doesn't return an error (#554142)


0001-Fix-possible-crasher-in-Bluetooth-plugin.patch:
 bluetooth.c |   28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

--- NEW FILE 0001-Fix-possible-crasher-in-Bluetooth-plugin.patch ---
>From 5963eacf7f3414b002cd8899fba398700c341eda Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 21 Jan 2010 15:18:42 +0000
Subject: [PATCH] Fix possible crasher in Bluetooth plugin

Avoid crashing when the dbus_g_proxy_call() fails but returns
no error.

https://bugzilla.redhat.com/show_bug.cgi?id=554142
---
 src/plugins/bluetooth/bluetooth.c |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/plugins/bluetooth/bluetooth.c b/src/plugins/bluetooth/bluetooth.c
index 972a87b..f2db2dd 100644
--- a/src/plugins/bluetooth/bluetooth.c
+++ b/src/plugins/bluetooth/bluetooth.c
@@ -81,22 +81,25 @@ init (NstPlugin *plugin)
 	if (dbus_g_proxy_call (manager, "DefaultAdapter", &e,
 			   G_TYPE_INVALID, DBUS_TYPE_G_OBJECT_PATH, &adapter, G_TYPE_INVALID) == FALSE) {
 		g_object_unref (manager);
-		if (e->domain == DBUS_GERROR &&
-		    e->code == DBUS_GERROR_REMOTE_EXCEPTION) {
-			const char *name;
+		if (e != NULL) {
+			if (e->domain == DBUS_GERROR &&
+			    e->code == DBUS_GERROR_REMOTE_EXCEPTION) {
+				const char *name;
 
-			name = dbus_g_error_get_name (e);
+				name = dbus_g_error_get_name (e);
 
-			/* No adapter */
-			if (g_str_equal (name, "org.bluez.Error.NoSuchAdapter") != FALSE) {
-				g_error_free (e);
-				return FALSE;
+				/* No adapter */
+				if (g_str_equal (name, "org.bluez.Error.NoSuchAdapter") != FALSE) {
+					g_error_free (e);
+					return FALSE;
+				}
 			}
+			g_warning ("Couldn't get default bluetooth adapter: %s",
+				   e->message);
+			g_error_free (e);
+		} else {
+			g_warning ("Couldn't get default bluetooth adapter: No error given");
 		}
-
-		g_warning ("Couldn't get default bluetooth adapter: %s",
-			   e->message);
-		g_error_free (e);
 		return FALSE;
 	}
 
-- 
1.6.6



Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/F-12/nautilus-sendto.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- nautilus-sendto.spec	17 Nov 2009 18:59:32 -0000	1.89
+++ nautilus-sendto.spec	21 Jan 2010 15:22:20 -0000	1.90
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
 Version:        2.28.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -29,6 +29,9 @@ Provides: nautilus-sendto-gaim
 Obsoletes: nautilus-sendto-bluetooth
 Provides: nautilus-sendto-bluetooth
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=554142
+Patch0:	0001-Fix-possible-crasher-in-Bluetooth-plugin.patch
+
 %description
 The nautilus-sendto package provides a Nautilus context menu for
 sending files via other desktop applications.  These functions are
@@ -48,6 +51,7 @@ for writing plugins for nautilus-sendto.
 
 %prep
 %setup -q
+%patch0 -p1 -b .error
 
 %build
 %configure
@@ -104,6 +108,10 @@ fi
 %{_includedir}/nautilus-sendto/nautilus-sendto-plugin.h
 
 %changelog
+* Thu Jan 21 2010 Bastien Nocera <bnocera at redhat.com> 2.28.2-2
+- Fix possible crasher when dbus_g_proxy_call() fails but
+  doesn't return an error (#554142)
+
 * Tue Nov 17 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-1
 - Update to 2.28.2
 - Add devel sub-package