rpms/entangle/F-13 entangle-0.1.0-udev-crash.patch, NONE, 1.1 entangle.spec, 1.1, 1.2

[Daniel P. Berrange]

Author: berrange

Update of /cvs/pkgs/rpms/entangle/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6958

Modified Files:
	entangle.spec 
Added Files:
	entangle-0.1.0-udev-crash.patch 
Log Message:
Fix crash in udev handler with NULL properties (rhbz #600759)

entangle-0.1.0-udev-crash.patch:
 entangle-device-manager.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE entangle-0.1.0-udev-crash.patch ---
diff -rup entangle-0.1.0.orig/src/backend/entangle-device-manager.c entangle-0.1.0.new/src/backend/entangle-device-manager.c
--- entangle-0.1.0.orig/src/backend/entangle-device-manager.c	2010-04-08 00:20:13.000000000 +0100
+++ entangle-0.1.0.new/src/backend/entangle-device-manager.c	2010-06-07 11:13:22.576432424 +0100
@@ -120,13 +120,20 @@ static void do_udev_event(GUdevClient *c
         return;
 
     devtype = g_udev_device_get_devtype(dev);
-    if (strcmp(devtype, "usb_device") != 0)
+    if ((devtype == NULL) ||
+        strcmp(devtype, "usb_device") != 0)
         return;
 
     sysfs = g_udev_device_get_sysfs_path(dev);
 
     usbbus = g_udev_device_get_property(dev, "BUSNUM");
     usbdev = g_udev_device_get_property(dev, "DEVNUM");
+
+    if (sysfs == NULL ||
+        usbbus == NULL ||
+        usbdev == NULL)
+        return;
+
     port = g_strdup_printf("usb:%s,%s", usbbus, usbdev);
 
     ENTANGLE_DEBUG("%s device '%s' '%s'", action, sysfs, port);


Index: entangle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/entangle/F-13/entangle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- entangle.spec	11 Apr 2010 23:09:54 -0000	1.1
+++ entangle.spec	7 Jun 2010 10:16:14 -0000	1.2
@@ -12,10 +12,12 @@
 Summary: Tethered shooting & control of digital cameras
 Name: entangle
 Version: 0.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: Applications/Multimedia
 Source: http://entangle-photo.org/download/sources/%{name}-%{version}.tar.gz
+Patch1: %{name}-%{version}-udev-crash.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://entangle-photo.org/
 
@@ -119,6 +121,9 @@ update-desktop-database %{_datadir}/appl
 %endif
 
 %changelog
+* Mon Jun  7 2010 Daniel P. Berrange <berrange at redhat.com> - 0.1.0-3
+- Fix crash in udev handler with NULL properties (rhbz #600759)
+
 * Fri Apr  9 2010 Daniel P. Berrange <berrange at redhat.com> - 0.1.0-2
 - Remove redundant website content from RPM