diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2006-09-21 16:19:40 +0000 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2006-09-21 16:19:40 +0000 |
| commit | 764131fd374a518e31c77ec5b953330ba55fec90 (patch) | |
| tree | 1f661caba6e8189aff22518cfbe18153fe253957 | |
| parent | d9ebfa690ef6258b40d784ed213a0ee1e55a4fea (diff) | |
Revert previous memleak fix since it is incorrect. The real leak is inside dbus-sdp.c
| -rw-r--r-- | hcid/dbus-rfcomm.c | 12 |
1 files 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); |