Fix copy function of payload
authorAbhay agarwal <ay.agarwal@samsung.com>
Wed, 18 Dec 2019 09:29:29 +0000 (14:59 +0530)
committerDoHyun Pyun <dh79.pyun@samsung.com>
Mon, 30 Dec 2019 07:29:55 +0000 (16:29 +0900)
Signed-off-by: Abhay agarwal <ay.agarwal@samsung.com>
ua-daemon/src/ua-manager-core.c

index 115ac3a..928340c 100644 (file)
@@ -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;
        }