Merge "Revert "Fix svace issues"" into tizen

diff --git a/bt-api/bt-event-handler.c b/bt-api/bt-event-handler.c
index bef35df..de5e298 100644 (file)
--- a/bt-api/bt-event-handler.c
+++ b/bt-api/bt-event-handler.c
@@ -3703,6 +3703,11 @@ static void __bt_otp_event_filter(GDBusConnection *connection,
                _bt_common_event_cb(BLUETOOTH_EVENT_OTC_STATE_CHANGED,
                                result, otc_info,
                                event_info->cb, event_info->user_data);
+               if (otc_info->address)
+                       g_free(otc_info->address);
+
+               if (otc_info)
+                       g_free(otc_info);
        }
 
        BT_DBG("-");

diff --git a/bt-service/services/adapter/bt-service-core-adapter-le.c b/bt-service/services/adapter/bt-service-core-adapter-le.c
index 642fde8..6451af5 100644 (file)
--- a/bt-service/services/adapter/bt-service-core-adapter-le.c
+++ b/bt-service/services/adapter/bt-service-core-adapter-le.c
@@ -1659,6 +1659,8 @@ int _bt_set_advertising_data(const char *sender, int adv_handle,
                        g_free(adv_setup.service_uuid);
                if (adv_setup.service_data)
                        g_free(adv_setup.service_data);
+               if (adv_setup.solicit_uuid)
+                       g_free(adv_setup.solicit_uuid);
                return BLUETOOTH_ERROR_INTERNAL;
        }
        /* Set Scan response false */
@@ -1682,6 +1684,8 @@ int _bt_set_advertising_data(const char *sender, int adv_handle,
                        g_free(adv_setup.service_data);
                if (adv_setup.service_uuid)
                        g_free(adv_setup.service_uuid);
+               if (adv_setup.solicit_uuid)
+                       g_free(adv_setup.solicit_uuid);
                return BLUETOOTH_ERROR_INTERNAL;
        }
 
@@ -1717,6 +1721,8 @@ int _bt_set_advertising_data(const char *sender, int adv_handle,
                g_free(adv_setup.service_data);
        if (adv_setup.service_uuid)
                g_free(adv_setup.service_uuid);
+       if (adv_setup.solicit_uuid)
+               g_free(adv_setup.solicit_uuid);
 
        /* Update adv handle in table */
        _bt_update_adv_handle(sender, adv_handle);
@@ -1789,6 +1795,8 @@ int _bt_set_scan_response_data(const char *sender, int adv_handle,
                        g_free(adv_setup.service_uuid);
                if (adv_setup.service_data)
                        g_free(adv_setup.service_data);
+               if (adv_setup.solicit_uuid)
+                       g_free(adv_setup.solicit_uuid);
                return BLUETOOTH_ERROR_INTERNAL;
        }
 
@@ -1811,6 +1819,8 @@ int _bt_set_scan_response_data(const char *sender, int adv_handle,
                        g_free(adv_setup.service_data);
                if (adv_setup.service_uuid)
                        g_free(adv_setup.service_uuid);
+               if (adv_setup.solicit_uuid)
+                       g_free(adv_setup.solicit_uuid);
                return BLUETOOTH_ERROR_INTERNAL;
        }
 
@@ -1846,6 +1856,8 @@ int _bt_set_scan_response_data(const char *sender, int adv_handle,
                g_free(adv_setup.service_data);
        if (adv_setup.service_uuid)
                g_free(adv_setup.service_uuid);
+       if (adv_setup.solicit_uuid)
+               g_free(adv_setup.solicit_uuid);
 
        /* Update adv handle in table */
        _bt_update_adv_handle(sender, adv_handle);