From f44fd3f9e41bf467360ace93ef5b532d8f61fb2c Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Fri, 28 Dec 2007 15:47:21 +0200 Subject: [PATCH] Config: D-Bus: Don't leak timers TimerCancel doesn't free the timer: you need TimerFree for that. --- config/dbus-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/dbus-core.c b/config/dbus-core.c index eab72a530..9cf153076 100644 --- a/config/dbus-core.c +++ b/config/dbus-core.c @@ -76,7 +76,7 @@ teardown(void) struct config_dbus_core_hook *hook; if (bus_info.timer) { - TimerCancel(bus_info.timer); + TimerFree(bus_info.timer); bus_info.timer = NULL; } @@ -116,6 +116,8 @@ message_filter(DBusConnection *connection, DBusMessage *message, void *data) bus_info.connection = NULL; teardown(); + if (bus_info.timer) + TimerFree(bus_info.timer); bus_info.timer = TimerSet(NULL, 0, 1, reconnect_timer, NULL); return DBUS_HANDLER_RESULT_HANDLED; @@ -186,6 +188,7 @@ static CARD32 reconnect_timer(OsTimerPtr timer, CARD32 time, pointer arg) { if (connect_to_bus()) { + TimerFree(bus_info.timer); bus_info.timer = NULL; return 0; }