[Pkg-utopia-commits] r1731 - in /packages/unstable/hal/debian: changelog patches/75-hal-serial-null.patch

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sun Sep 23 14:32:04 2007
New Revision: 1731

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1731
Log:
* debian/patches/75-hal-serial-null.patch: Fix crash when linux.device_file
  of a serial device isn't known (Closes: #439919, #440468)

Added:
    packages/unstable/hal/debian/patches/75-hal-serial-null.patch
Modified:
    packages/unstable/hal/debian/changelog

Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=1731&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Sun Sep 23 14:32:04 2007
@@ -1,8 +1,10 @@
 hal (0.5.9.1-5) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
-
- -- Michael Biebl <biebl at debian.org>  Fri, 17 Aug 2007 17:30:30 +0200
+  [ Sjoerd Simons ]
+  * debian/patches/75-hal-serial-null.patch: Fix crash when linux.device_file
+    of a serial device isn't known (Closes: #439919, #440468)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 23 Sep 2007 16:26:38 +0200
 
 hal (0.5.9.1-4) unstable; urgency=low
 

Added: packages/unstable/hal/debian/patches/75-hal-serial-null.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/75-hal-serial-null.patch?rev=1731&op=file
==============================================================================
--- packages/unstable/hal/debian/patches/75-hal-serial-null.patch (added)
+++ packages/unstable/hal/debian/patches/75-hal-serial-null.patch Sun Sep 23 14:32:04 2007
@@ -1,0 +1,39 @@
+commit afcd255ed7dd4729824242f216549c24b5a7a603
+Author: Danny Kukawka <danny.kukawka at web.de>
+Date:   Fri Aug 10 18:08:26 2007 +0200
+
+    fix possible segfault on serial device check
+    
+    Applied slightly adopted patch from Natanael Copa <natanael.copa at gmail.com>:
+    > The problem is that serial_get_prober() dont check if
+    > hal_device_property_get_string() returns NULL or not.
+
+commit e8e3988db89e062210d9d97778775ae27e2b4815
+Author: Danny Kukawka <danny.kukawka at web.de>
+Date:   Thu Aug 16 15:45:31 2007 +0200
+
+    fix compilerwarning in serial_get_prober()
+    
+    Fixed compilerwarning in serial_get_prober() about incompatible
+    pointer types.
+
+diff --git a/hald/linux/device.c b/hald/linux/device.c
+index 45cd25b..c6e9942 100644
+diff -Nur hal-0.5.9.1/hald/linux/device.c hal-0.5.9.1.new/hald/linux/device.c
+--- hal-0.5.9.1/hald/linux/device.c	2007-04-03 18:40:48.000000000 +0200
++++ hal-0.5.9.1.new/hald/linux/device.c	2007-09-23 16:30:37.000000000 +0200
+@@ -1223,9 +1223,12 @@
+ static const gchar *
+ serial_get_prober (HalDevice *d)
+ {
++	const gchar *dev;
++
+ 	/* FIXME TODO: check if there is an other way, to call the porber only
+-		 on ttyS* devices, than check the name of the device file */
+-	if (!strncmp(hal_device_property_get_string (d, "linux.device_file"), "/dev/ttyS", 9))
++		       on ttyS* devices, than check the name of the device file */
++	dev  = hal_device_property_get_string (d, "linux.device_file");
++	if (dev && !strncmp(dev, "/dev/ttyS", 9))
+ 		return "hald-probe-serial";
+ 	else 
+ 		return NULL;