Replace g_memdup to g_memdup2

Change-Id: I5a302c2b1810e1d3896ec04f338ce7a74267c62c
Signed-off-by: dh79pyun <dh79.pyun@samsung.com>

diff --git a/src/bluetooth-adapter.c b/src/bluetooth-adapter.c
index c0cee957639dc48159b1e87cc1a3e8fe044a1e76..a1b9065eaab077c01a0bf9135788260081ccc521 100644 (file)
--- a/src/bluetooth-adapter.c
+++ b/src/bluetooth-adapter.c
@@ -1112,8 +1112,8 @@ int bt_adapter_get_local_oob_data(unsigned char **hash,
                if (oob_data.randomizer_len > BLUETOOTH_OOB_DATA_LENGTH)
                        oob_data.randomizer_len = BLUETOOTH_OOB_DATA_LENGTH;
 
-               *hash = g_memdup(oob_data.hash, oob_data.hash_len);
-               *randomizer = g_memdup(oob_data.randomizer,
+               *hash = g_memdup2(oob_data.hash, oob_data.hash_len);
+               *randomizer = g_memdup2(oob_data.randomizer,
                                                oob_data.randomizer_len);
                *hash_len = oob_data.hash_len;
                *randomizer_len = oob_data.randomizer_len;
@@ -1192,8 +1192,8 @@ int bt_adapter_get_local_oob_ext_data(unsigned char **hash192, unsigned char **r
                *hash256_len = *randomizer256_len = 0;
 
                if (oob_data.hash_len && oob_data.randomizer_len) {
-                       *hash192 = g_memdup(oob_data.hash, oob_data.hash_len);
-                       *randomizer192 = g_memdup(oob_data.randomizer,
+                       *hash192 = g_memdup2(oob_data.hash, oob_data.hash_len);
+                       *randomizer192 = g_memdup2(oob_data.randomizer,
                                        oob_data.randomizer_len);
 
                        *hash192_len = oob_data.hash_len;
@@ -1201,8 +1201,8 @@ int bt_adapter_get_local_oob_ext_data(unsigned char **hash192, unsigned char **r
                }
 
                if (oob_data.hash256_len && oob_data.randomizer256_len) {
-                       *hash256 = g_memdup(oob_data.hash256, oob_data.hash256_len);
-                       *randomizer256 = g_memdup(oob_data.randomizer256,
+                       *hash256 = g_memdup2(oob_data.hash256, oob_data.hash256_len);
+                       *randomizer256 = g_memdup2(oob_data.randomizer256,
                                        oob_data.randomizer256_len);
 
                        *hash256_len = oob_data.hash256_len;
@@ -3040,13 +3040,13 @@ static bt_le_scan_filter_s *__bt_adapter_le_duplicate_scan_filter(
        filter->service_solicitation_uuid = g_strdup(src->service_solicitation_uuid);
        filter->service_solicitation_uuid_mask = g_strdup(src->service_solicitation_uuid_mask);
        filter->service_data_uuid = g_strdup(src->service_data_uuid);
-       filter->service_data = g_memdup(src->service_data, src->service_data_len);
+       filter->service_data = g_memdup2(src->service_data, src->service_data_len);
        filter->service_data_len = src->service_data_len;
-       filter->service_data_mask = g_memdup(src->service_data_mask, src->service_data_len);
+       filter->service_data_mask = g_memdup2(src->service_data_mask, src->service_data_len);
        filter->manufacturer_id = src->manufacturer_id;
-       filter->manufacturer_data = g_memdup(src->manufacturer_data, src->manufacturer_data_len);
+       filter->manufacturer_data = g_memdup2(src->manufacturer_data, src->manufacturer_data_len);
        filter->manufacturer_data_len = src->manufacturer_data_len;
-       filter->manufacturer_data_mask = g_memdup(src->manufacturer_data_mask, src->manufacturer_data_len);
+       filter->manufacturer_data_mask = g_memdup2(src->manufacturer_data_mask, src->manufacturer_data_len);
        filter->rssi_high_threshold = src->rssi_high_threshold;
 
        return filter;
@@ -3456,7 +3456,7 @@ int bt_adapter_le_get_scan_result_service_data_list(const bt_adapter_le_device_s
                        snprintf((*data_list)[data_index].service_uuid, 5,
                                "%2.2X%2.2X", remain_data[3], remain_data[2]);
 
-                       (*data_list)[data_index].service_data = g_memdup(
+                       (*data_list)[data_index].service_data = g_memdup2(
                                                        &remain_data[4], field_len - 3);
                        (*data_list)[data_index].service_data_len = field_len - 3;
 
@@ -3474,7 +3474,7 @@ int bt_adapter_le_get_scan_result_service_data_list(const bt_adapter_le_device_s
                                                remain_data[5], remain_data[4],
                                                remain_data[3], remain_data[2]);
 
-                       (*data_list)[data_index].service_data = g_memdup(
+                       (*data_list)[data_index].service_data = g_memdup2(
                                                        &remain_data[18], field_len - 17);
                        (*data_list)[data_index].service_data_len = field_len - 17;
 
@@ -3600,7 +3600,7 @@ int bt_adapter_le_get_scan_result_manufacturer_data(const bt_adapter_le_device_s
                        *manufacturer_id = remain_data[3] << 8;
                        *manufacturer_id += remain_data[2];
 
-                       *manufacturer_data = g_memdup(&remain_data[4], field_len - 3);
+                       *manufacturer_data = g_memdup2(&remain_data[4], field_len - 3);
                        *manufacturer_data_len = field_len - 3;
 
                        return BT_ERROR_NONE;
@@ -3864,7 +3864,7 @@ int bt_adapter_le_scan_filter_set_service_data(bt_scan_filter_h scan_filter,
        g_free(__filter->service_data_mask);
 
        __filter->service_data_uuid = strdup(uuid);
-       __filter->service_data = g_memdup(data, data_len);
+       __filter->service_data = g_memdup2(data, data_len);
        __filter->service_data_len = data_len;
        __filter->service_data_mask = NULL;
 
@@ -3895,9 +3895,9 @@ int bt_adapter_le_scan_filter_set_service_data_with_mask(bt_scan_filter_h scan_f
        g_free(__filter->service_data_mask);
 
        __filter->service_data_uuid = strdup(uuid);
-       __filter->service_data = g_memdup(data, data_len);
+       __filter->service_data = g_memdup2(data, data_len);
        __filter->service_data_len = data_len;
-       __filter->service_data_mask = g_memdup(mask, data_len);
+       __filter->service_data_mask = g_memdup2(mask, data_len);
 
        return BT_ERROR_NONE;
 }
@@ -3929,7 +3929,7 @@ int bt_adapter_le_scan_filter_set_manufacturer_data(bt_scan_filter_h scan_filter
 
        __filter->manufacturer_id = manufacturer_id;
        if (data != NULL) {
-               __filter->manufacturer_data = g_memdup(data, data_len);
+               __filter->manufacturer_data = g_memdup2(data, data_len);
                __filter->manufacturer_data_len = data_len;
        } else {
                __filter->manufacturer_data = NULL;
@@ -3969,9 +3969,9 @@ int bt_adapter_le_scan_filter_set_manufacturer_data_with_mask(bt_scan_filter_h s
        g_free(__filter->manufacturer_data_mask);
 
        __filter->manufacturer_id = manufacturer_id;
-       __filter->manufacturer_data = g_memdup(data, data_len);
+       __filter->manufacturer_data = g_memdup2(data, data_len);
        __filter->manufacturer_data_len = data_len;
-       __filter->manufacturer_data_mask = g_memdup(mask, data_len);
+       __filter->manufacturer_data_mask = g_memdup2(mask, data_len);
 
        return BT_ERROR_NONE;
 }

diff --git a/src/bluetooth-common.c b/src/bluetooth-common.c
index c979630fcdfdc239bc07d3948baf4b8bf34b271a..b3f328f8d482a038e13f8a25e51698124332d9ef 100644 (file)
--- a/src/bluetooth-common.c
+++ b/src/bluetooth-common.c
@@ -626,7 +626,7 @@ int _bt_get_ad_data_by_type(char *in_data, int in_len,
                return BLUETOOTH_ERROR_NONE;
        }
 
-       *data = g_memdup(&in_data[i], len);
+       *data = g_memdup2(&in_data[i], len);
        if (*data == NULL)
                return BLUETOOTH_ERROR_OUT_OF_MEMORY;
        *data_len = len;
@@ -3013,7 +3013,7 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
                                                g_free(chr->value);
                                                chr->value = NULL;
                                                if (char_val->val_len > 0)
-                                                       chr->value = g_memdup(char_val->char_value, char_val->val_len);
+                                                       chr->value = g_memdup2(char_val->char_value, char_val->val_len);
                                                chr->value_length = char_val->val_len;
                                                /* TODO : Fix build error temporary */
                                                if (chr->write_value_requested_cb)
@@ -4220,7 +4220,7 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
                BT_DBG("Mesh: Msg opcode: 0x%4.4X", res->opcode);
                msg->opcode = res->opcode;
                if (res->msg_len > 0) {
-                       msg->data = g_memdup(res->msg, res->msg_len + 1);
+                       msg->data = g_memdup2(res->msg, res->msg_len + 1);
                        BT_DBG("Mesh: msg %s", msg->data);
                }
 
@@ -4262,7 +4262,7 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
                BT_DBG("Mesh: Msg opcode: 0x%4.4X", res->opcode);
                msg->opcode = res->opcode;
                if (res->msg_len > 0) {
-                       msg->data = g_memdup(res->msg, res->msg_len + 1);
+                       msg->data = g_memdup2(res->msg, res->msg_len + 1);
                        BT_DBG("Mesh: msg %s", msg->data);
                }
 

diff --git a/src/bluetooth-gatt.c b/src/bluetooth-gatt.c
index 5e0791f318ed3d3f14a6c67254e1324bbbb1be29..3c190a07f5379dd4b98dd004b0211da82cb41be1 100644 (file)
--- a/src/bluetooth-gatt.c
+++ b/src/bluetooth-gatt.c
@@ -1419,11 +1419,11 @@ int bt_gatt_get_value(bt_gatt_h gatt_handle, char **value, int *value_length)
        if (handle->type == BT_GATT_TYPE_CHARACTERISTIC) {
                *value_length = chr->value_length;
                if (chr->value_length > 0)
-                       *value = g_memdup(chr->value, chr->value_length);
+                       *value = g_memdup2(chr->value, chr->value_length);
        } else if (handle->type == BT_GATT_TYPE_DESCRIPTOR) {
                *value_length = desc->value_length;
                if (desc->value_length > 0)
-                       *value = g_memdup(desc->value, desc->value_length);
+                       *value = g_memdup2(desc->value, desc->value_length);
        } else {
                BT_ERR("Type is invalid(type:%d)", handle->type);
                return BT_ERROR_INVALID_PARAMETER;
@@ -1614,7 +1614,7 @@ int bt_gatt_set_value(bt_gatt_h gatt_handle, const char *value,
        g_free(*val);
        *val = NULL;
        if (value_length > 0)
-               *val = g_memdup(value, value_length);
+               *val = g_memdup2(value, value_length);
        *val_len = value_length;
 
        return BT_ERROR_NONE; /* LCOV_EXCL_STOP */
@@ -2347,7 +2347,7 @@ int bt_gatt_characteristic_create(const char *uuid, int permissions,
        chr->write_type = BT_GATT_WRITE_TYPE_WRITE;
        chr->value_length = value_length;
        if (value_length > 0) {
-               chr->value = g_memdup(value, value_length);
+               chr->value = g_memdup2(value, value_length);
                if (chr->value == NULL) {
                        ret = BT_ERROR_OUT_OF_MEMORY;
                        goto fail;
@@ -2637,7 +2637,7 @@ int bt_gatt_descriptor_create(const char *uuid, int permissions,
        desc->permissions = permissions;
        desc->value_length = value_length;
        if (value_length > 0) {
-               desc->value = g_memdup(value, value_length);
+               desc->value = g_memdup2(value, value_length);
                if (desc->value == NULL) {
                        ret = BT_ERROR_OUT_OF_MEMORY;
                        goto fail;