hal/tools fstab-sync.c,1.27.2.1,1.27.2.2

[David Zeuthen]

Update of /cvs/hal/hal/tools
In directory gabe:/tmp/cvs-serv9479/tools

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

	* tools/fstab-sync.c (remove_udi): Check for return value to
	avoid dereferencing a NULL pointer

	* hald/linux/block_class_device.c (block_class_pre_process): Only
	do drive_id real SCSI since doing an INQUIRY on USB devices may
	crash the device if the transfer length is not exactly 36 bytes.

	* hald/linux/libsysfs/sysfs.h: Remove the #define DEBUG symbol
	again

	* hald/Makefile.am (hald_SOURCES): Add linux/pcmcia_bus_device.c

	* hald/linux/pcmcia_bus_device.c: New file

	* hald/linux/osspec.c: Add support for 16-bit PCMCIA in sysfs;
	without this hald won't work for 16-bit PCMCIA cards and a 
	kernel with sysfs support for those.



Index: fstab-sync.c
===================================================================
RCS file: /cvs/hal/hal/tools/fstab-sync.c,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -u -d -r1.27.2.1 -r1.27.2.2
--- fstab-sync.c	9 Dec 2004 03:19:10 -0000	1.27.2.1
+++ fstab-sync.c	21 Jan 2005 15:46:55 -0000	1.27.2.2
@@ -1417,6 +1417,8 @@
     return FALSE;
 
   block_device = hal_device_get_property_string (hal_context, udi, "block.device");
+  if (block_device == NULL)
+	  return FALSE;
 
   dir = strdup (_PATH_FSTAB); 	 
   last_slash = strrchr (dir, '/');