[Iprdd-commit] iprutils iprlib.c,1.125,1.126 version.mk,1.75,1.76

[Wayne B. <wb...@us...>]

Update of /cvsroot/iprdd/iprutils
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20330/iprutils

Modified Files:
	iprlib.c version.mk 
Log Message:
Fixes a NULL pointer dereference which caused the daemons to silently fail.

Index: version.mk
===================================================================
RCS file: /cvsroot/iprdd/iprutils/version.mk,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- version.mk	14 Aug 2009 17:36:32 -0000	1.75
+++ version.mk	16 Sep 2009 23:38:05 -0000	1.76
@@ -6,9 +6,9 @@
 
 IPR_MAJOR_RELEASE=2
 IPR_MINOR_RELEASE=2
-IPR_FIX_LEVEL=16
+IPR_FIX_LEVEL=17
 IPR_RELEASE=1
-IPR_FIX_DATE=(August 14, 2009)
+IPR_FIX_DATE=(September 16, 2009)
 
 IPR_VERSION_STR=$(IPR_MAJOR_RELEASE).$(IPR_MINOR_RELEASE).$(IPR_FIX_LEVEL) $(IPR_FIX_DATE)
 

Index: iprlib.c
===================================================================
RCS file: /cvsroot/iprdd/iprutils/iprlib.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- iprlib.c	14 Aug 2009 17:36:32 -0000	1.125
+++ iprlib.c	16 Sep 2009 23:38:05 -0000	1.126
@@ -1906,6 +1906,9 @@
 			class_devices = sysfs_get_class_devices(sysfs_host_class);
 			dlist_for_each_data(class_devices, class_device, struct sysfs_class_device) {
 				sysfs_host_device = sysfs_get_classdev_device(class_device);
+				if (!sysfs_host_device)
+					continue;
+
 				sysfs_pci_device = sysfs_get_device_parent(sysfs_host_device);
 
 				if (strcmp(pci_address, sysfs_pci_device->name) == 0) {
@@ -1924,6 +1927,9 @@
 			class_devices = sysfs_get_class_devices(sysfs_device_class);
 			dlist_for_each_data(class_devices, class_device, struct sysfs_class_device) {
 				sysfs_device_device = sysfs_get_classdev_device(class_device);
+				if (!sysfs_device_device)
+					continue;
+
 				sprintf(buf, "%d:255:255:255", ipr_ioa->host_num);
 
 				if (!strcmp(buf, sysfs_device_device->name)) {