From: Abhay Agarwal <ay.agarwal@samsung.com>
Date: Thu, 17 Sep 2020 05:12:05 +0000 (+0530)
Subject: Mesh: Fix coverity issues
X-Git-Tag: accepted/tizen/6.0/unified/20201030.120317~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47bac170a1bcb4932789e40708f46ef8235ef7fe;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

Mesh: Fix coverity issues

Change-Id: I0f10756c1e4ee5c66da595df29976870eed561f0
Signed-off-by: Abhay Agarwal <ay.agarwal@samsung.com>
---

diff --git a/bt-service/services/mesh/bt-service-mesh-cdb.c b/bt-service/services/mesh/bt-service-mesh-cdb.c
index 583c80c..2882e3d 100644
--- a/bt-service/services/mesh/bt-service-mesh-cdb.c
+++ b/bt-service/services/mesh/bt-service-mesh-cdb.c
@@ -2029,7 +2029,6 @@ bool _bt_mesh_conf_set_node_comp_data(_bt_mesh_cdb_t *cfg,
 		}
 
 		while (len >= 4 && v--) {
-			jobj = json_object_new_object();
 			mod_id = l_get_le16(data + 2);
 			mod_id = l_get_le16(data) << 16 | mod_id;
 
@@ -2059,7 +2058,11 @@ bool _bt_mesh_conf_set_node_comp_data(_bt_mesh_cdb_t *cfg,
 fail:
 	/* Reset elements array */
 	json_object_object_del(jnode, "elements");
-	__mesh_init_elements(sz);
+	jelements = __mesh_init_elements(sz);
+
+	if (jelements)
+		json_object_object_add(jnode, "elements", jelements);
+	__bt_mesh_save_configruation_file(cfg);
 
 	return false;
 }