From 9d0aba81e0f9cf31898dbfb3eced35a5a1cfe98f Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange@fedoraproject.org>
Date: Jun 07 2010 10:29:40 +0000
Subject: Fix crash in udev handler with NULL properties (rhbz #600759)


---

diff --git a/entangle-0.1.0-udev-crash.patch b/entangle-0.1.0-udev-crash.patch
new file mode 100644
index 0000000..22f4ae1
--- /dev/null
+++ b/entangle-0.1.0-udev-crash.patch
@@ -0,0 +1,25 @@
+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);
diff --git a/entangle.spec b/entangle.spec
index f8e3403..d8c3c46 100644
--- a/entangle.spec
+++ b/entangle.spec
@@ -12,10 +12,12 @@
 Summary: Tethered shooting & control of digital cameras
 Name: entangle
 Version: 0.1.0
-Release: 2%{?dist}
+Release: 4%{?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/
 
@@ -52,6 +54,7 @@ and 'hands off' shooting directly from the controlling computer.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 
@@ -119,6 +122,9 @@ update-desktop-database %{_datadir}/applications
 %endif
 
 %changelog
+* Mon Jun  7 2010 Daniel P. Berrange <berrange@redhat.com> - 0.1.0-4
+- Fix crash in udev handler with NULL properties (rhbz #600759)
+
 * Fri Apr  9 2010 Daniel P. Berrange <berrange@redhat.com> - 0.1.0-2
 - Remove redundant website content from RPM