From 1dfa5fe6fbb98a9d63a3eaa1d231d28e6cc34a7e Mon Sep 17 00:00:00 2001 From: Abhay agarwal Date: Wed, 18 Dec 2019 14:59:29 +0530 Subject: [PATCH] Fix copy function of payload Signed-off-by: Abhay agarwal --- ua-daemon/src/ua-manager-core.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ua-daemon/src/ua-manager-core.c b/ua-daemon/src/ua-manager-core.c index 115ac3a..928340c 100644 --- a/ua-daemon/src/ua-manager-core.c +++ b/ua-daemon/src/ua-manager-core.c @@ -648,7 +648,6 @@ static void __uam_copy_uam_payload_info( uam_db_payload_info_t *dst_payload, uam_ble_payload_s *src_payload) { if (src_payload) { - dst_payload = g_new0(uam_db_payload_info_t, 1); dst_payload->primary_key = src_payload->primary_key; dst_payload->device_icon = src_payload->device_icon; dst_payload->secondary_key = src_payload->secondary_key; @@ -2400,8 +2399,8 @@ int _uam_core_init(void) } else { for (l = db_payload_list; NULL != l; l = g_slist_next(l)) { db_payload_info_t *db_payload = l->data; - uam_db_payload_info_t *payload; - GSList *l1; + uam_db_payload_info_t *payload = g_new0(uam_db_payload_info_t, 1); + GSList *l1 = NULL; if (!db_payload) continue; @@ -3935,7 +3934,7 @@ int _uam_core_add_payload(uam_ble_payload_s *payload, FUNC_ENTRY; int ret = UAM_ERROR_NONE; uam_db_tech_info_t *tech_info; - uam_db_payload_info_t *db_payload; + uam_db_payload_info_t *db_payload = g_new0(uam_db_payload_info_t, 1); char *mac; retv_if(NULL == payload, UAM_ERROR_INVALID_PARAMETER); @@ -4010,8 +4009,7 @@ int _uam_core_get_payloads(int *count, uam_ble_payload_s **payload_list) if (!db_info) continue; - - __uam_copy_db_payload_info(&(*payload_list)[*count], db_info); + __uam_copy_db_payload_info(&((*payload_list)[*count]), db_info); *count += 1; } -- 2.7.4