summaryrefslogtreecommitdiff
path: root/src/bluetooth-common.c
diff options
context:
space:
mode:
authorDoHyun Pyun <dh79.pyun@samsung.com>2017-09-29 09:50:57 +0900
committerDoHyun Pyun <dh79.pyun@samsung.com>2017-09-29 10:25:06 +0900
commit6fd5e4d167c4e6d5ff37e6b94f49d68b3023e769 (patch)
tree49958b97ecc846c50ccc2a98f788a5e9f11acb2b /src/bluetooth-common.c
parent7a2f2ee405b3ce25926f31533861e6eefd71c0c5 (diff)
downloadbluetooth-6fd5e4d167c4e6d5ff37e6b94f49d68b3023e769.tar.gz
bluetooth-6fd5e4d167c4e6d5ff37e6b94f49d68b3023e769.tar.bz2
bluetooth-6fd5e4d167c4e6d5ff37e6b94f49d68b3023e769.zip
Change-Id: Ie98b199946c1b3e66ee7180c4b45b30ed7524930 Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
Diffstat (limited to 'src/bluetooth-common.c')
-rw-r--r--src/bluetooth-common.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/bluetooth-common.c b/src/bluetooth-common.c
index 6a5892d..0cfb154 100644
--- a/src/bluetooth-common.c
+++ b/src/bluetooth-common.c
@@ -1602,8 +1602,6 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
(bt_map_client_message_item_s*)(messages_struct->message_items),
messages_struct->size,
bt_event_slot_container[event_index].user_data);
- if (device_addr != NULL)
- free(device_addr);
break;
case BLUETOOTH_EVENT_MAP_GET_MESSAGE_COMPLETE:
@@ -1611,15 +1609,16 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
bt_get_message_callback_data *data = bt_event_slot_container[event_index].user_data;
char *target_file = (char*) data->target_file;
- void *user_data = data->user_data;
- g_free(data);
+ void *map_user_data = data->user_data;
bt_map_client_message_s *res = g_malloc0(sizeof(bt_map_client_message_s));
res->file_path = target_file;
((bt_map_client_get_message_cb)bt_event_slot_container[event_index].callback)(
- param->result, res, user_data);
+ param->result, res, map_user_data);
+
g_free(res);
+ g_free(data);
break;
case BLUETOOTH_EVENT_MAP_PUSH_MESSAGE_COMPLETE: