From b4d571bba305f05810e77e7b1309524d3bf53f3f Mon Sep 17 00:00:00 2001
From: "John (J5) Palmieri" <johnp@redhat.com>
Date: Fri, 8 Sep 2006 15:23:50 +0000
Subject: * dbus/dbus-connection.c (dbus_connection_dispatch): Properly remove 
 filters (Patch from Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbus/dbus-connection.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'dbus/dbus-connection.c')

diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 8033c4a5..91f7770c 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -3718,6 +3718,13 @@ dbus_connection_dispatch (DBusConnection *connection)
       DBusMessageFilter *filter = link->data;
       DBusList *next = _dbus_list_get_next_link (&filter_list_copy, link);
 
+      if (filter->function == NULL)
+        {
+          _dbus_verbose ("  filter was removed in a callback function\n");
+          link = next;
+          continue;
+        }
+
       _dbus_verbose ("  running filter on message %p\n", message);
       result = (* filter->function) (connection, message, filter->user_data);
 
-- 
cgit