From 60254ab6081dc0896f1b6885e72cedaec868e7b6 Mon Sep 17 00:00:00 2001 From: Inga Stotland Date: Wed, 5 Jun 2019 18:18:31 -0700 Subject: [PATCH] mesh: Make "elements" mandatory in node configuration This patch modifies the behavior of node configuration parsing: if "elements" property is not present, th configuration file for this node is regarded as malformed. Also, clean up style. Change-Id: I3a869f74cf103f04fdb99f991c0156932372354e Signed-off-by: Anupam Roy --- mesh/mesh-db.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/mesh/mesh-db.c b/mesh/mesh-db.c index ed3cb0f..d48cee0 100644 --- a/mesh/mesh-db.c +++ b/mesh/mesh-db.c @@ -766,8 +766,6 @@ static bool parse_bindings(json_object *jbindings, struct mesh_db_model *mod) return true; mod->bindings = l_new(uint16_t, cnt); - if (!mod->bindings) - return false; for (i = 0; i < cnt; ++i) { int idx; @@ -878,8 +876,6 @@ static bool parse_model_subscriptions(json_object *jsubs, return true; subs = l_new(struct mesh_db_sub, cnt); - if (!subs) - return false; for (i = 0; i < cnt; ++i) { char *str; @@ -995,14 +991,15 @@ static bool parse_elements(json_object *jelements, struct mesh_db_node *node) { int i, num_ele; + if (json_object_get_type(jelements) != json_type_array) + return false; + num_ele = json_object_array_length(jelements); if (!num_ele) /* Allow "empty" nodes */ return true; node->elements = l_queue_new(); - if (!node->elements) - return false; for (i = 0; i < num_ele; ++i) { json_object *jelement; @@ -1023,8 +1020,6 @@ static bool parse_elements(json_object *jelements, struct mesh_db_node *node) ele = l_new(struct mesh_db_element, 1); ele->index = index; ele->models = l_queue_new(); - if (!ele->models) - goto fail; if (!json_object_object_get_ex(jelement, "location", &jvalue)) goto fail; @@ -1208,12 +1203,12 @@ bool mesh_db_read_node(json_object *jnode, mesh_db_node_cb cb, void *user_data) if (json_object_object_get_ex(jnode, "sequenceNumber", &jvalue)) node.seq_number = json_object_get_int(jvalue); - if (json_object_object_get_ex(jnode, "elements", &jvalue)) { - if (json_object_get_type(jvalue) == json_type_array) { - if (!parse_elements(jvalue, &node)) - return false; - } - } + /* Check for required "elements" property */ + if (!json_object_object_get_ex(jnode, "elements", &jvalue)) + return false; + + if (!parse_elements(jvalue, &node)) + return false; return cb(&node, user_data); } -- 2.7.4