hal/hald/linux block_class_device.c,1.86.2.5,1.86.2.6

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux
In directory gabe:/tmp/cvs-serv12700/hald/linux

Modified Files:
      Tag: hal-0_4-stable-branch
	block_class_device.c 
Log Message:
2005-01-03  David Zeuthen  <davidz at redhat.com>

	* hald/linux/block_class_device.c (detect_media): hald contains a
	file descriptor leak that makes normal users unable to eject audio
	CDs and other CDs/DVDs that does not contain normal filesystems.
	Problem identified and fixed by Peter Österlund, originally posted
	on LKML.



Index: block_class_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/block_class_device.c,v
retrieving revision 1.86.2.5
retrieving revision 1.86.2.6
diff -u -d -r1.86.2.5 -r1.86.2.6
--- block_class_device.c	31 Dec 2004 12:01:52 -0000	1.86.2.5
+++ block_class_device.c	3 Jan 2005 15:45:06 -0000	1.86.2.6
@@ -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);