2003-05-16 Havoc Pennington <hp@redhat.com>

	* bus/policy.c (free_rule_list_func): avoid a crash when passed
	NULL as DBusHashTable is annoyingly likely to do.

diff --git a/ChangeLog b/ChangeLog
index 1d60b5a7bbbd065602255df85fb91203510fc705..8f9bfa0253a2f2e972fcf44120a9f12cdca9c888 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-16  Havoc Pennington  <hp@redhat.com>
+
+       * bus/policy.c (free_rule_list_func): avoid a crash when passed
+       NULL as DBusHashTable is annoyingly likely to do.
+
 2003-05-16  Colin Walters  <walters@verbum.org>
 
        * tools/dbus-monitor.c: Add --session argument and usage()

diff --git a/bus/policy.c b/bus/policy.c
index 74ed71008c5edd8bf845e5a84aaadbf4aea585b5..938f7daad950fa960513698747a743f1e1f2ae8d 100644 (file)
--- a/bus/policy.c
+++ b/bus/policy.c
@@ -124,6 +124,9 @@ free_rule_list_func (void *data)
 {
   DBusList **list = data;
 
+  if (list == NULL) /* DBusHashTable is on crack */
+    return;
+  
   _dbus_list_foreach (list, free_rule_func, NULL);
   
   _dbus_list_clear (list);