From: saerome.kim <saerome.kim@samsung.com>
Date: Mon, 19 Mar 2018 10:29:25 +0000 (+0900)
Subject: Fix svace issue
X-Git-Tag: submit/tizen/20180320.010219^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F70%2F173070%2F1;p=platform%2Fcore%2Fapi%2Fzigbee.git

Fix svace issue

- WID 316204
- WID 316211

Change-Id: I84e92d3f8a03b424cfca48e3c8707adbef2e4095
Signed-off-by: saerome.kim <saerome.kim@samsung.com>
---

diff --git a/lib/zbl_dbus.c b/lib/zbl_dbus.c
old mode 100755
new mode 100644
index 925e310..04c1f3d
--- a/lib/zbl_dbus.c
+++ b/lib/zbl_dbus.c
@@ -843,9 +843,10 @@ static void _zbl_signal_handler(GDBusConnection *connection,
 				}
 				if (data_size != 0xFF) {
 					for (i = 0; i < data_size; i++) {
-						g_variant_iter_loop(data_iter, "(y)", &value);
-						records[j]->value[i] = value;
-						DBG("value[%d] 0x%02X", i, records[j]->value[i]);
+						if (g_variant_iter_loop(data_iter, "(y)", &value)) {
+							records[j]->value[i] = value;
+							DBG("value[%d] 0x%02X", i, records[j]->value[i]);
+						}
 					}
 				}
 				g_variant_iter_free(data_iter);
@@ -2841,7 +2842,10 @@ GROUP_VIEW_GROUP_REQ_OUT:
 		g_variant_get(parameters, "(qyyqyqa(y)ya(y))", &addr16, &ep, &status, &group_id, &scene_id,
 			&transition_time, &sceneNameIter, &ext_len, &extendedSetIter);
 
-		g_variant_iter_loop(sceneNameIter, "(y)", &value);
+		if (!g_variant_iter_loop(sceneNameIter, "(y)", &value)) {
+			ERR("There is no scene data");
+			return;
+		}
 
 		/** first byte indicates the length of the string */
 		len = value -'0';
diff --git a/test/main.c b/test/main.c
index cec121b..24cb084 100644
--- a/test/main.c
+++ b/test/main.c
@@ -143,7 +143,7 @@ static void _init_endpoints()
 	sj_ep1.ep = 1;
 	sj_ep1.profile_id = 0x0104;
 	sj_ep1.device_id = 0x0002;
-	sj_ep1.num_of_in_clusters = 8;
+	sj_ep1.num_of_in_clusters = 7;
 	sj_ep1.num_of_out_clusters = 1;
 	/* In clusters : 0000 0003 0004 0005 0006 0009 0B04 0B05 */
 	sj_ep1.in_clusters[0] = ZB_ZCL_BASIC_CLUSTER_ID;