Fix the svace issue (146981, 147807, 168145, 174996)

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

diff --git a/bt-api/bt-event-handler.c b/bt-api/bt-event-handler.c
index 8290950..8f7a64a 100644 (file)
--- a/bt-api/bt-event-handler.c
+++ b/bt-api/bt-event-handler.c
@@ -2956,8 +2956,8 @@ static void __bt_tds_event_filter(GDBusConnection *connection,
                        g_free(info->data);
                        g_free(info);
                }
-               if (var)
-                       g_variant_unref(var);
+
+               g_variant_unref(var);
        } else if (strcasecmp(signal_name, BT_TDS_ACTIVATION_RESULT) == 0) {
                BT_DBG("TDS Control point Activation result");
                const char *address = NULL;
@@ -2995,8 +2995,8 @@ static void __bt_tds_event_filter(GDBusConnection *connection,
                _bt_common_event_cb(BLUETOOTH_EVENT_TDS_ACTIVATION_INDICATION,
                                BLUETOOTH_ERROR_NONE,  &ind_res,
                                event_info->cb, event_info->user_data);
-               if (byte_var)
-                       g_variant_unref(byte_var);
+
+               g_variant_unref(byte_var);
        } else if (strcasecmp(signal_name, BT_TDS_CONTROL_POINT_ENABLED) == 0) {
                BT_DBG("TDS Control point Enabled event");
                const char *address = NULL;

diff --git a/bt-api/bt-hid-device.c b/bt-api/bt-hid-device.c
index 4aa02f1..776a57a 100644 (file)
--- a/bt-api/bt-hid-device.c
+++ b/bt-api/bt-hid-device.c
@@ -635,6 +635,8 @@ BT_EXPORT_API int bluetooth_hid_device_activate(void)
        BT_INFO("uuid %s", profile_info.uuid);
        result = _bt_register_profile(&profile_info, FALSE);
 
+       g_free(profile_info.role);
+
        return result;
 }
 

diff --git a/bt-api/bt-network.c b/bt-api/bt-network.c
index c8256ec..43453cd 100644 (file)
--- a/bt-api/bt-network.c
+++ b/bt-api/bt-network.c
@@ -112,6 +112,7 @@ BT_EXPORT_API int bluetooth_network_connect(const bluetooth_device_address_t *de
 
                if (dev_class.major_class == BLUETOOTH_DEVICE_MAJOR_CLASS_COMPUTER) {
                        BT_ERR("Reject a authorization due to MDM Policy");
+                       g_free(uuid);
                        return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
                }
        }

diff --git a/bt-core/bt-core-noti-handler.c b/bt-core/bt-core-noti-handler.c
index 7615e5d..9231efa 100644 (file)
--- a/bt-core/bt-core-noti-handler.c
+++ b/bt-core/bt-core-noti-handler.c
@@ -316,18 +316,18 @@ void _bt_core_handle_flight_mode_noti(void)
 
 void _bt_core_handle_power_saving_mode_noti(void)
 {
-       int ret = 0;
-
        if (TIZEN_PROFILE_WEARABLE)
                return;
 
        BT_DBG("+");
 #ifdef ENABLE_TIZEN_2_4
+       int ret = 0;
+
        ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_PSMODE,
                        (vconf_callback_fn)__bt_core_power_saving_mode_cb, NULL);
-#endif
        if (ret < 0)
                BT_ERR("Unable to register key handler");
+#endif
 }
 
 void _bt_core_unregister_vconf_handler(void)

diff --git a/bt-httpproxy/bt-httpproxy.c b/bt-httpproxy/bt-httpproxy.c
index 471aeb2..c322e9c 100644 (file)
--- a/bt-httpproxy/bt-httpproxy.c
+++ b/bt-httpproxy/bt-httpproxy.c
@@ -331,7 +331,6 @@ static void _bt_hps_set_char_value(const char *obj_path, const char* value, int
                                if (char_info->char_value) {
                                        if (str) {
                                                memcpy(char_info->char_value, str, strlen(str));
-                                               g_free(str);
                                        }
                                        if (offset > 0) {
                                                memcpy(&char_info->char_value[offset], value, value_length);
@@ -343,6 +342,7 @@ static void _bt_hps_set_char_value(const char *obj_path, const char* value, int
                                        hps_char_list = g_slist_insert_sorted(hps_char_list,
                                                                        char_info, char_info_cmp);
                                }
+                               g_free(str);
                                return;
                        }
                }

diff --git a/bt-service/bt-service-event-receiver.c b/bt-service/bt-service-event-receiver.c
index 76989c7..c1b7037 100644 (file)
--- a/bt-service/bt-service-event-receiver.c
+++ b/bt-service/bt-service-event-receiver.c
@@ -2292,6 +2292,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                        ipsp_proxy = _bt_get_ipsp_proxy();
                        if (ipsp_proxy == NULL) {
                                BT_ERR("can not get ipsp proxy");
+                               g_free(address);
                                return;
                        }
 
@@ -2303,6 +2304,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                        ipsp_proxy = _bt_get_ipsp_proxy();
                        if (ipsp_proxy == NULL) {
                                BT_ERR("can not get ipsp proxy");
+                               g_free(address);
                                return;
                        }
 

diff --git a/bt-service/bt-service-hid.c b/bt-service/bt-service-hid.c
index ee5949a..60fe60d 100644 (file)
--- a/bt-service/bt-service-hid.c
+++ b/bt-service/bt-service-hid.c
@@ -188,6 +188,8 @@ int _bt_hid_connect(int request_id,
 
        if (ret != BLUETOOTH_ERROR_NONE) {
                BT_ERR("_bt_connect_profile Error");
+               g_free(func_data->address);
+               g_free(func_data);
                return ret;
        }
        return BLUETOOTH_ERROR_NONE;
@@ -223,6 +225,8 @@ int _bt_hid_disconnect(int request_id,
 
        if (ret != BLUETOOTH_ERROR_NONE) {
                BT_ERR("_bt_disconnect_profile Error");
+               g_free(func_data->address);
+               g_free(func_data);
                return ret;
        }
 

diff --git a/bt-service/bt-service-tds.c b/bt-service/bt-service-tds.c
index 5ae0880..90dcc26 100644 (file)
--- a/bt-service/bt-service-tds.c
+++ b/bt-service/bt-service-tds.c
@@ -888,9 +888,9 @@ int _bt_tds_provider_transport_remove(const char *sender, unsigned int tds_handl
         * advertising will be enabled again with updated advertising data.
         */
        if (_bt_is_multi_adv_supported())
-               __bt_tds_disable_advertising(provider);
+               ret = __bt_tds_disable_advertising(provider);
        else
-               __bt_tds_disable_advertising(NULL);
+               ret = __bt_tds_disable_advertising(NULL);
        if (ret != BLUETOOTH_ERROR_NONE) {
                BT_ERR("Failed to enable advertising with error: %d", ret);
                return ret;
@@ -1020,7 +1020,7 @@ static int __bt_tds_send_activation_response(char *address,
        int i;
 
        retv_if(NULL == address, BLUETOOTH_ERROR_INVALID_PARAM);
-       retv_if(0 > len && NULL == data, BLUETOOTH_ERROR_INVALID_PARAM);
+       retv_if(NULL == data, BLUETOOTH_ERROR_INVALID_PARAM);
 
        BT_DBG("+");
        conn = _bt_gdbus_get_system_gconn();
@@ -1075,7 +1075,7 @@ int _bt_tds_provider_send_activation_response(char *sender, unsigned int tds_han
 
        retv_if(NULL == sender, BLUETOOTH_ERROR_INVALID_PARAM);
        retv_if(NULL == address, BLUETOOTH_ERROR_INVALID_PARAM);
-       retv_if(0 > len && NULL == data, BLUETOOTH_ERROR_INVALID_PARAM);
+       retv_if(NULL == data, BLUETOOTH_ERROR_INVALID_PARAM);
 
        BT_DBG("+");
 
@@ -1112,7 +1112,7 @@ void _bt_tds_handle_activation_request(const char *path,
                unsigned char org_id, unsigned char *buf, int len)
 {
        int transport;
-       char *address;
+       char *address = NULL;
        GVariant *tds_data;
        GVariant *param;
        int count = 0;
@@ -1158,12 +1158,15 @@ void _bt_tds_handle_activation_request(const char *path,
        if (0 == count)
                goto err;
 
+       g_free(address);
+
        BT_DBG("-");
        return;
 err:
        /* send activation response as error to bluez */
        __bt_tds_send_activation_response(address,
                TDS_CONTROL_POINT_RESPONSE_UNSUPPORTED_ORG_ID, NULL, 0);
+       g_free(address);
 }
 
 void _bt_tds_stop_by_terminated_process(char *name)
@@ -1780,8 +1783,7 @@ void _bt_tds_check_indication(const char *path, GVariant *msg)
                /* Send Indication & info removed internally */
                __bt_tds_send_indication_event(info, buffer, len);
 
-               if (value)
-                       g_variant_unref(value);
+               g_variant_unref(value);
        }
        BT_DBG("-");
 }