sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

gdbus/watch: Fix aborting when removing D-Bus filter 

In case of filter_data having a watch to a service name it may call
dbus_connection_remove_filter twice causing libdbus to abort:

process 24723: Attempt to remove filter function 0x4063e0 user data (nil), but no such filter has been added

To fix this the code will now only attempt to call
dbus_connection_remove_filter once in filter_data_free which is the
counterpart of filter_data_get where dbus_connection_add_filter is called.
This commit is contained in:
Luiz Augusto von Dentz 2013-09-03 18:00:35 +03:00 committed by Marcel Holtmann
parent 68cc171e40
commit 3849da14e5
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gdbus/watch.c
View File

@ -281,6 +281,11 @@ static void filter_data_free(struct filter_data *data)
{ {
GSList *l; GSList *l;
/* Remove filter if there are no listeners left for the connection */
if (filter_data_find(data->connection) == NULL)
dbus_connection_remove_filter(data->connection, message_filter,
NULL);
for (l = data->callbacks; l != NULL; l = l->next) for (l = data->callbacks; l != NULL; l = l->next)
g_free(l->data); g_free(l->data);
@ -360,8 +365,6 @@ static void service_data_free(struct service_data *data)
static gboolean filter_data_remove_callback(struct filter_data *data, static gboolean filter_data_remove_callback(struct filter_data *data,
struct filter_callback *cb) struct filter_callback *cb)
{ {
DBusConnection *connection;
data->callbacks = g_slist_remove(data->callbacks, cb); data->callbacks = g_slist_remove(data->callbacks, cb);
data->processed = g_slist_remove(data->processed, cb); data->processed = g_slist_remove(data->processed, cb);
@ -385,16 +388,8 @@ static gboolean filter_data_remove_callback(struct filter_data *data,
if (data->registered && !remove_match(data)) if (data->registered && !remove_match(data))
return FALSE; return FALSE;
connection = dbus_connection_ref(data->connection);
listeners = g_slist_remove(listeners, data); listeners = g_slist_remove(listeners, data);
/* Remove filter if there are no listeners left for the connection */
if (filter_data_find(connection) == NULL)
dbus_connection_remove_filter(connection, message_filter,
NULL);
filter_data_free(data); filter_data_free(data);
dbus_connection_unref(connection);
return TRUE; return TRUE;
} }
@ -563,6 +558,9 @@ static DBusHandlerResult message_filter(DBusConnection *connection,
current); current);
} }
if (delete_listener == NULL)
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
for (current = delete_listener; current != NULL; for (current = delete_listener; current != NULL;
current = delete_listener->next) { current = delete_listener->next) {
GSList *l = current->data; GSList *l = current->data;
@ -581,11 +579,6 @@ static DBusHandlerResult message_filter(DBusConnection *connection,
g_slist_free(delete_listener); g_slist_free(delete_listener);
/* Remove filter if there are no listeners left for the connection */
if (filter_data_find(connection) == NULL)
dbus_connection_remove_filter(connection, message_filter,
NULL);
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
} }
@ -814,6 +807,4 @@ void g_dbus_remove_all_watches(DBusConnection *connection)
listeners = g_slist_remove(listeners, data); listeners = g_slist_remove(listeners, data);
filter_data_call_and_free(data); filter_data_call_and_free(data);
} }
dbus_connection_remove_filter(connection, message_filter, NULL);
} }