[Pkg-utopia-commits] r151 - in packages/hal/trunk/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2004-12-30 08:28:10 -0700 (Thu, 30 Dec 2004)
New Revision: 151

Added:
   packages/hal/trunk/debian/patches/cdrom-fdleak.patch
Modified:
   packages/hal/trunk/debian/changelog
Log:
Don't leak a filedescriptor when the filesystem of a data cdrom isn't
recognized 


Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog	2004-12-26 15:03:29 UTC (rev 150)
+++ packages/hal/trunk/debian/changelog	2004-12-30 15:28:10 UTC (rev 151)
@@ -1,3 +1,12 @@
+hal (0.4.2-6) unstable; urgency=low
+
+  * debian/patches/cdrom-fdleak.patch
+    + Added. Don't leak a filedescriptor to the cdrom device when the
+    filesystem on a data cd isn't recognized. Patch from Peter Österlund
+    (Closes: #287779)
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Thu, 30 Dec 2004 15:29:04 +0100
+
 hal (0.4.2-5) unstable; urgency=high
 
   * Create /var/run/hal dir on start if it's not there (Closes: #287258)

Added: packages/hal/trunk/debian/patches/cdrom-fdleak.patch
===================================================================
--- packages/hal/trunk/debian/patches/cdrom-fdleak.patch	2004-12-26 15:03:29 UTC (rev 150)
+++ packages/hal/trunk/debian/patches/cdrom-fdleak.patch	2004-12-30 15:28:10 UTC (rev 151)
@@ -0,0 +1,15 @@
+Index: hald/linux/block_class_device.c
+===================================================================
+RCS file: /cvs/hal/hal/hald/linux/block_class_device.c,v
+retrieving revision 1.86.2.4
+diff -u -r1.86.2.4 block_class_device.c
+--- hald/linux/block_class_device.c	9 Dec 2004 03:15:22 -0000	1.86.2.4
++++ hald/linux/block_class_device.c	30 Dec 2004 14:28:42 -0000
+@@ -1065,6 +1065,7 @@
+ 				if (is_cdrom) {
+ 					/* volume_id cannot probe blank/audio discs etc,
+ 					 * so don't fail for them, just set vid to NULL */
++					volume_id_close(vid);
+ 					vid = NULL;
+ 				} else {
+ 					g_object_unref (child);