From 3791dcca16cb46b0ff7305beff75d1aa2645940c Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 13 Feb 2003 00:08:18 +0000 Subject: 2003-02-10 Havoc Pennington * dbus/dbus-auth-script.c, dbus/dbus-auth-script.h: sync initial cut at test framework for DBusAuth from laptop. Doesn't quite work yet but it compiles and I need to get it off the 266mhz laptop. ;-) * dbus/dbus-server-debug.c (_dbus_server_debug_accept_transport): fix a memleak in error case --- dbus/dbus-server-debug.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'dbus/dbus-server-debug.c') diff --git a/dbus/dbus-server-debug.c b/dbus/dbus-server-debug.c index 57d68066..f558e82e 100644 --- a/dbus/dbus-server-debug.c +++ b/dbus/dbus-server-debug.c @@ -231,8 +231,8 @@ dbus_bool_t _dbus_server_debug_accept_transport (DBusServer *server, DBusTransport *transport) { - DBusTimeout *timeout; - ServerAndTransport *st; + DBusTimeout *timeout = NULL; + ServerAndTransport *st = NULL; st = dbus_new (ServerAndTransport, 1); if (st == NULL) @@ -244,18 +244,18 @@ _dbus_server_debug_accept_transport (DBusServer *server, timeout = _dbus_timeout_new (DEFAULT_INTERVAL, handle_new_client, st, dbus_free); if (timeout == NULL) - { - dbus_free (st); - return FALSE; - } + goto failed; if (!_dbus_server_add_timeout (server, timeout)) - { - _dbus_timeout_unref (timeout); - return FALSE; - } + goto failed; return TRUE; + + failed: + dbus_free (st); + if (timeout) + _dbus_timeout_unref (timeout); + return FALSE; } /** @} */ -- cgit