From: Havoc Pennington <hp@redhat.com>
Date: Fri, 16 May 2003 16:48:07 +0000 (+0000)
Subject: 2003-05-16  Havoc Pennington  <hp@redhat.com>
X-Git-Tag: dbus-object-names-branchpoint~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce53bbd7af4488b8374aeccc2e80fb2f7eff0683;p=thirdparty%2Fdbus.git

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 1d60b5a7b..8f9bfa025 100644
--- 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 74ed71008..938f7daad 100644
--- 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);