From 764131fd374a518e31c77ec5b953330ba55fec90 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Thu, 21 Sep 2006 16:19:40 +0000 Subject: Revert previous memleak fix since it is incorrect. The real leak is inside dbus-sdp.c --- hcid/dbus-rfcomm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hcid/dbus-rfcomm.c b/hcid/dbus-rfcomm.c index 64b0580d..558d2c5d 100644 --- a/hcid/dbus-rfcomm.c +++ b/hcid/dbus-rfcomm.c @@ -727,14 +727,14 @@ static DBusHandlerResult rfcomm_connect_req(DBusConnection *conn, return error_invalid_arguments(conn, msg); } + if (!err) + return DBUS_HANDLER_RESULT_HANDLED; + if (uuid) free(uuid); if (handle) free(handle); - if (!err) - return DBUS_HANDLER_RESULT_HANDLED; - rfcomm_continue_data_free(cdata); return error_failed(conn, msg, err); @@ -952,14 +952,14 @@ static DBusHandlerResult rfcomm_bind_req(DBusConnection *conn, return error_invalid_arguments(conn, msg); } + if (!err) + return DBUS_HANDLER_RESULT_HANDLED; + if (uuid) free(uuid); if (handle) free(handle); - if (!err) - return DBUS_HANDLER_RESULT_HANDLED; - rfcomm_continue_data_free(cdata); return error_failed(conn, msg, err); -- cgit