From 4abf29afdfd527c3ddd450972cf0bf6d4e823f09 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Thu, 9 Dec 2010 21:52:54 +0200 Subject: gdbus: fix accessing freed callback data cb->disc_func or cb->conn_func could remove the callback so this needs to be checked for before continuing processing. --- gdbus/watch.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gdbus') diff --git a/gdbus/watch.c b/gdbus/watch.c index e7c203ae..9cb7ec70 100644 --- a/gdbus/watch.c +++ b/gdbus/watch.c @@ -477,6 +477,11 @@ static DBusHandlerResult service_filter(DBusConnection *connection, cb->conn_func(connection, cb->user_data); } + /* Check if the watch was removed/freed by the callback + * function */ + if (!g_slist_find(data->callbacks, cb)) + continue; + /* Only auto remove if it is a bus name watch */ if (data->argument[0] == ':' && (cb->conn_func == NULL || cb->disc_func == NULL)) { @@ -484,11 +489,6 @@ static DBusHandlerResult service_filter(DBusConnection *connection, continue; } - /* Check if the watch was removed/freed by the callback - * function */ - if (!g_slist_find(data->callbacks, cb)) - continue; - data->callbacks = g_slist_remove(data->callbacks, cb); data->processed = g_slist_append(data->processed, cb); } -- cgit v1.2.3