hal/hald hald_dbus.c,1.3,1.4

Joe Shaw joe at pdx.freedesktop.org
Fri Apr 30 11:37:37 PDT 2004


Update of /cvs/hal/hal/hald
In directory pdx:/tmp/cvs-serv28815/hald

Modified Files:
	hald_dbus.c 
Log Message:
2004-04-30  Joe Shaw  <joe at ximian.com>

	* hald/hald_dbus.c (foreach_device_by_capability): Make sure caps
	is not NULL before comparing strings.

Index: hald_dbus.c
===================================================================
RCS file: /cvs/hal/hal/hald/hald_dbus.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/hald_dbus.c	26 Apr 2004 20:08:58 -0000	1.3
+++ b/hald_dbus.c	30 Apr 2004 18:37:35 -0000	1.4
@@ -347,7 +347,7 @@
 
 	caps = hal_device_property_get_string (device, "info.capabilities");
 
-	if (strstr (caps, info->capability) != NULL) {
+	if (caps != NULL && strstr (caps, info->capability) != NULL) {
 		dbus_message_iter_append_string (info->iter,
 						 hal_device_get_udi (device));
 	}





More information about the hal-commit mailing list