Fix the prevent issues

Change-Id: I37fb04cbea9d0177b9d26c6454f0de4798ea5e37
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/common/src/libraries/bt-callback.c b/common/src/libraries/bt-callback.c
index 2cd4ac9..bba653e 100644 (file)
--- a/common/src/libraries/bt-callback.c
+++ b/common/src/libraries/bt-callback.c
@@ -533,11 +533,13 @@ void _bt_cb_new_le_device_found(int result, bt_adapter_le_device_scan_result_inf
                dev = _bt_main_create_searched_le_device_item((void *)info);
                if (NULL == dev) {
                        BT_ERR("Create new device item failed");
+                       g_free(remote_name);
                        return;
                }
 
                if (_bt_main_add_searched_device(ugd, dev) == NULL) {
                        BT_ERR("Fail to add the searched device");
+                       g_free(remote_name);
                        return;
                }
 
@@ -545,6 +547,7 @@ void _bt_cb_new_le_device_found(int result, bt_adapter_le_device_scan_result_inf
                        eina_list_append(ugd->searched_device, dev);
        }
 
+       g_free(remote_name);
        FN_END;
 }
 

diff --git a/common/src/ui/bt-main-view.c b/common/src/ui/bt-main-view.c
index db1a320..ea9b5a4 100644 (file)
--- a/common/src/ui/bt-main-view.c
+++ b/common/src/ui/bt-main-view.c
@@ -2149,9 +2149,14 @@ bt_dev_t *_bt_main_create_searched_le_device_item(void *data)
                return NULL;
        }
 
-       if (strlen(remote_name) == 0)
+       if (!remote_name)
                return NULL;
 
+       if (strlen(remote_name) == 0) {
+               g_free(remote_name);
+               return NULL;
+       }
+
        /* only HOG Device will be shown in searched list */
        if (bt_adapter_le_get_scan_result_service_uuids(
                                dev_info, BT_ADAPTER_LE_PACKET_ADVERTISING, &uuids, &count) == BT_ERROR_NONE) {
@@ -2159,16 +2164,22 @@ bt_dev_t *_bt_main_create_searched_le_device_item(void *data)
                        BT_DBG("UUID[%d] = %s", i + 1, uuids[i]);
                        if (g_strcmp0(HOGP_SERVICE_UUID, uuids[i]) == 0)
                                is_hog++;
-
+                       g_free(uuids[i]);
                }
+               g_free(uuids);
        } else
                BT_ERR("Fail to get LE service uuids");
 
-       if (!is_hog)
+       if (!is_hog) {
+               g_free(remote_name);
                return NULL;
+       }
 
        dev = calloc(1, sizeof(bt_dev_t));
-       retv_if(dev == NULL, NULL);
+       if (dev == NULL) {
+               g_free(remote_name);
+               return NULL;
+       }
 
        strncpy(dev->name, remote_name, DEVICE_NAME_MAX_LEN);
 
@@ -2186,6 +2197,7 @@ bt_dev_t *_bt_main_create_searched_le_device_item(void *data)
                        dev->bd_addr[1], dev->bd_addr[2], dev->bd_addr[3],
                        dev->bd_addr[4], dev->bd_addr[5]);
 
+       g_free(remote_name);
        FN_END;
        return dev;
 }