summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2006-04-05 09:50:17 +0000
committerJohan Hedberg <johan.hedberg@nokia.com>2006-04-05 09:50:17 +0000
commit737b2a1a36c13e575d3cfb21f7e42553407cb6d2 (patch)
treea5f8b888947d10dc4ee41672998b756c09c3967c
parent2ac9112221f2bdb397cd680fcea1a711d7938066 (diff)
Plug small potential memory leak in D-Bus name monitoring code
-rw-r--r--hcid/dbus-common.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/hcid/dbus-common.c b/hcid/dbus-common.c
index 8bef4840..dd46ccd8 100644
--- a/hcid/dbus-common.c
+++ b/hcid/dbus-common.c
@@ -146,11 +146,10 @@ static void name_data_remove(const char *name, name_cb_t func, void *user_data)
return;
cb = name_callback_find(data->callbacks, func, user_data);
- if (!cb)
- return;
-
- data->callbacks = slist_remove(data->callbacks, cb);
- free(cb);
+ if (cb) {
+ data->callbacks = slist_remove(data->callbacks, cb);
+ free(cb);
+ }
if (!data->callbacks) {
name_listeners = slist_remove(name_listeners, data);