commit b0099a9e615bfe030858b327f60fa86ef333ef15
author Michal Vasko <mvasko@cesnet.cz> Mon Aug 31 14:55:23 2020 +0200
committer Michal Vasko <mvasko@cesnet.cz> Mon Aug 31 14:55:23 2020 +0200
tree fa92a2e470f3ea2187926fa0ce652a7de3eb65ad
parent 27915724a15c2020a24800b4187ebb0f16ecbbd9

libyang BUGFIX return value checking

src/xpath.c

diff --git a/src/xpath.c b/src/xpath.c
index 8f96c45..ea436e4 100644
--- a/src/xpath.c
+++ b/src/xpath.c
@@ -5290,22 +5290,25 @@
  *
  * @param[in,out] set Set to use.
  * @param[in] options Xpath options.
+ * @return LY_ERR value.
  */
-static void
+static LY_ERR
 moveto_root(struct lyxp_set *set, uint32_t options)
 {
     if (!set) {
-        return;
+        return LY_SUCCESS;
     }
 
     if (options & LYXP_SCNODE_ALL) {
         set_scnode_clear_ctx(set);
-        lyxp_set_scnode_insert_node(set, NULL, set->root_type, NULL);
+        LY_CHECK_RET(lyxp_set_scnode_insert_node(set, NULL, set->root_type, NULL));
     } else {
         set->type = LYXP_SET_NODE_SET;
         set->used = 0;
         set_insert_node(set, NULL, 0, set->root_type, 0);
     }
+
+    return LY_SUCCESS;
 }
 
 /**
@@ -7237,11 +7240,10 @@
 eval_absolute_location_path(struct lyxp_expr *exp, uint16_t *tok_idx, struct lyxp_set *set, uint32_t options)
 {
     uint8_t all_desc;
-    LY_ERR rc;
 
     if (set) {
         /* no matter what tokens follow, we need to be at the root */
-        moveto_root(set, options);
+        LY_CHECK_RET(moveto_root(set, options));
     }
 
     /* '/' RelativeLocationPath? */
@@ -7261,8 +7263,7 @@
         case LYXP_TOKEN_AT:
         case LYXP_TOKEN_NAMETEST:
         case LYXP_TOKEN_NODETYPE:
-            rc = eval_relative_location_path(exp, tok_idx, all_desc, set, options);
-            LY_CHECK_RET(rc);
+            LY_CHECK_RET(eval_relative_location_path(exp, tok_idx, all_desc, set, options));
             break;
         default:
             break;
@@ -7276,8 +7277,7 @@
                lyxp_print_token(exp->tokens[*tok_idx]), exp->tok_pos[*tok_idx]);
         ++(*tok_idx);
 
-        rc = eval_relative_location_path(exp, tok_idx, all_desc, set, options);
-        LY_CHECK_RET(rc);
+        LY_CHECK_RET(eval_relative_location_path(exp, tok_idx, all_desc, set, options));
     }
 
     return LY_SUCCESS;