From 201671d08ad74d77bf5850b7cf61536b4fb48e15 Mon Sep 17 00:00:00 2001 From: "hyunuk.tak" Date: Tue, 14 Dec 2021 09:12:47 +0900 Subject: [PATCH] Replace g_memdup to g_memdup2 Change-Id: I0b3fb7d8946b7eb97b16a98191c9875a615b5006 --- ua-api/src/ua-api.c | 14 +++++++------- ua-daemon/src/pm/ua-pm-util.c | 2 +- ua-daemon/src/ua-manager-core.c | 4 ++-- ua-daemon/src/ua-manager-request-handler.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ua-api/src/ua-api.c b/ua-api/src/ua-api.c index ec39dc1..a8eca80 100755 --- a/ua-api/src/ua-api.c +++ b/ua-api/src/ua-api.c @@ -117,7 +117,7 @@ UAM_EXPORT_API int _uam_get_registered_users(GPtrArray **user_list) uam_user_info_s *info; info = &g_array_index(out_param, uam_user_info_s, i); - user_info = g_memdup(info, sizeof(uam_user_info_s)); + user_info = g_memdup2(info, sizeof(uam_user_info_s)); if (user_info) g_ptr_array_add(*user_list, (gpointer)user_info); } @@ -549,7 +549,7 @@ UAM_EXPORT_API int _uam_request_get_devices(GPtrArray **devices_list) uam_device_info_s *info; info = &g_array_index(out_param, uam_device_info_s, i); - device_info = g_memdup(info, sizeof(uam_device_info_s)); + device_info = g_memdup2(info, sizeof(uam_device_info_s)); if (device_info) g_ptr_array_add(*devices_list, (gpointer)device_info); } @@ -592,7 +592,7 @@ UAM_EXPORT_API int _uam_request_get_user_devices(char *account, uam_device_info_s *info; info = &g_array_index(out_param, uam_device_info_s, i); - device_info = g_memdup(info, sizeof(uam_device_info_s)); + device_info = g_memdup2(info, sizeof(uam_device_info_s)); if (device_info) g_ptr_array_add(*devices_list, (gpointer)device_info); } @@ -1350,7 +1350,7 @@ UAM_EXPORT_API int _uam_get_registered_services(GPtrArray **service_list) uam_service_info_s *info; info = &g_array_index(out_param, uam_service_info_s, i); - service_info = g_memdup(info, sizeof(uam_service_info_s)); + service_info = g_memdup2(info, sizeof(uam_service_info_s)); if (service_info) g_ptr_array_add(*service_list, (gpointer)service_info); } @@ -1393,7 +1393,7 @@ UAM_EXPORT_API int _uam_request_get_service_devices(char *svc_name, uam_device_info_s *info; info = &g_array_index(out_param, uam_device_info_s, i); - device_info = g_memdup(info, sizeof(uam_device_info_s)); + device_info = g_memdup2(info, sizeof(uam_device_info_s)); if (device_info) g_ptr_array_add(*devices_list, (gpointer)device_info); } @@ -1436,7 +1436,7 @@ UAM_EXPORT_API int _uam_request_get_service_users(char *svc_name, uam_user_info_s *info; info = &g_array_index(out_param, uam_user_info_s, i); - user_info = g_memdup(info, sizeof(uam_user_info_s)); + user_info = g_memdup2(info, sizeof(uam_user_info_s)); if (user_info) g_ptr_array_add(*users_list, (gpointer)user_info); } @@ -1574,7 +1574,7 @@ UAM_EXPORT_API int _uam_get_added_payloads(GPtrArray **payload_list) uam_ble_payload_s *info; info = &g_array_index(out_param, uam_ble_payload_s, i); - payload_info = g_memdup(info, sizeof(uam_ble_payload_s)); + payload_info = g_memdup2(info, sizeof(uam_ble_payload_s)); if (payload_info) g_ptr_array_add(*payload_list, (gpointer)payload_info); } diff --git a/ua-daemon/src/pm/ua-pm-util.c b/ua-daemon/src/pm/ua-pm-util.c index 16dac8e..837d0fd 100644 --- a/ua-daemon/src/pm/ua-pm-util.c +++ b/ua-daemon/src/pm/ua-pm-util.c @@ -174,7 +174,7 @@ void _pm_util_uam_db_payload_to_uas_payload( dst_payload->ext_val1 = src_payload->ext_val1; dst_payload->ext_val2 = src_payload->ext_val2; dst_payload->device_uid_len = src_payload->device_uid_len; - dst_payload->device_uid = g_memdup((src_payload->device_uid), + dst_payload->device_uid = g_memdup2((src_payload->device_uid), src_payload->device_uid_len); } } diff --git a/ua-daemon/src/ua-manager-core.c b/ua-daemon/src/ua-manager-core.c index b57e266..a3618c3 100755 --- a/ua-daemon/src/ua-manager-core.c +++ b/ua-daemon/src/ua-manager-core.c @@ -529,12 +529,12 @@ static void __uam_copy_uam_payload_info( dst_payload->ext_val1 = src_payload->ext_val1; dst_payload->ext_val2 = src_payload->ext_val2; dst_payload->device_uid_len = src_payload->device_uid_len; - dst_payload->device_uid = g_memdup(&(src_payload->device_uid), + dst_payload->device_uid = g_memdup2(&(src_payload->device_uid), src_payload->device_uid_len); user_data_len = UAM_BLE_PAYLOAD_DEVICE_UID_MAX_LEN - 1 - src_payload->device_uid_len; ret_if(0 == user_data_len); - dst_payload->user_data = g_memdup(&(src_payload->user_data), + dst_payload->user_data = g_memdup2(&(src_payload->user_data), user_data_len); FUNC_EXIT; diff --git a/ua-daemon/src/ua-manager-request-handler.c b/ua-daemon/src/ua-manager-request-handler.c index 8d72b13..d7a0dad 100755 --- a/ua-daemon/src/ua-manager-request-handler.c +++ b/ua-daemon/src/ua-manager-request-handler.c @@ -1318,7 +1318,7 @@ static int __uam_manager_async_request_handler( if (UAM_ERROR_NONE == result) { __uam_manager_save_request_context( context, result, sender, function, - g_memdup(&dev_info, sizeof(uam_device_info_s))); + g_memdup2(&dev_info, sizeof(uam_device_info_s))); } else { g_array_append_vals(*out_param1, &dev_info, sizeof(uam_device_info_s)); -- 2.7.4