From c835a4b0a030c07b57dd04fb71943a68dabaa9aa Mon Sep 17 00:00:00 2001 From: Deokhyun Kim Date: Tue, 7 Nov 2017 18:52:16 +0900 Subject: [PATCH] Fix mem leak. Change-Id: Ie8ce366a2fb6679e9a0bda902f41b06ca193b2ab Signed-off-by: Deokhyun Kim --- bt-api/bt-hid-device.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/bt-api/bt-hid-device.c b/bt-api/bt-hid-device.c index 93cd4fd..b287ca7 100644 --- a/bt-api/bt-hid-device.c +++ b/bt-api/bt-hid-device.c @@ -238,19 +238,17 @@ static gboolean __hid_disconnect(hid_connected_device_info_t *info) } info->disconnect_idle_id = 0; event_info = _bt_event_get_cb_data(BT_HID_DEVICE_EVENT); - if (event_info == NULL) - return FALSE; + if (event_info != NULL) { + memset(&bd_addr, 0x00, sizeof(bluetooth_device_address_t)); + _bt_convert_addr_string_to_type(bd_addr.addr , info->address); + _bt_common_event_cb(BLUETOOTH_HID_DEVICE_DISCONNECTED, + BLUETOOTH_ERROR_NONE, &bd_addr, + event_info->cb, event_info->user_data); + } - memset(&bd_addr, 0x00, sizeof(bluetooth_device_address_t)); - _bt_convert_addr_string_to_type(bd_addr.addr , info->address); - _bt_common_event_cb(BLUETOOTH_HID_DEVICE_DISCONNECTED, - BLUETOOTH_ERROR_NONE, &bd_addr, - event_info->cb, event_info->user_data); - if (info->address) - g_free(info->address); + g_free(info->address); g_free(info); - info = NULL; - BT_DBG("-"); + return FALSE; } -- 2.7.4