xpath BUGFIX handle input/output name conflicts

Fixes #2137

Author: michalvasko

src/xpath.c

@@ -7943,7 +7943,7 @@ eval_name_test_with_predicate_get_scnode(const struct ly_ctx *ctx, const struct
         uint32_t name_len, const struct lys_module *moveto_mod, enum lyxp_node_type root_type, LY_VALUE_FORMAT format,
         const struct lysc_node **found)
 {
-    const struct lysc_node *scnode;
+    const struct lysc_node *scnode, *scnode2;
     const struct lys_module *mod;
     uint32_t idx = 0;
 
@@ -7981,7 +7981,19 @@ eval_name_test_with_predicate_get_scnode(const struct ly_ctx *ctx, const struct
         }
 
         /* search in children, do not repeat the same search */
-        scnode = lys_find_child(node->schema, moveto_mod, name, name_len, 0, 0);
+        if (node->schema->nodetype & (LYS_RPC | LYS_ACTION)) {
+            /* make sure the node is unique, whether in input or output */
+            scnode = lys_find_child(node->schema, moveto_mod, name, name_len, 0, 0);
+            scnode2 = lys_find_child(node->schema, moveto_mod, name, name_len, 0, LYS_GETNEXT_OUTPUT);
+            if (scnode && scnode2) {
+                /* conflict, do not use hashes */
+                scnode = NULL;
+            } else if (scnode2) {
+                scnode = scnode2;
+            }
+        } else {
+            scnode = lys_find_child(node->schema, moveto_mod, name, name_len, 0, 0);
+        }
     } /* else skip redundant search */
 
     /* additional context check */

tests/utests/basic/test_xpath.c

@@ -88,6 +88,19 @@ const char *schema_a =
         "            type string;\n"
         "        }\n"
         "    }\n"
+        "\n"
+        "    rpc r {\n"
+        "        input {\n"
+        "            leaf l {\n"
+        "                type string;\n"
+        "            }\n"
+        "        }\n"
+        "        output {\n"
+        "            leaf l {\n"
+        "                type string;\n"
+        "            }\n"
+        "        }\n"
+        "    }\n"
         "}";
 
 static int
@@ -382,6 +395,31 @@ test_hash(void **state)
     lyd_free_all(tree);
 }
 
+static void
+test_rpc(void **state)
+{
+    const char *data =
+            "<r xmlns=\"urn:tests:a\">\n"
+            "    <l>val</l>\n"
+            "</r>";
+    struct ly_in *in;
+    struct lyd_node *tree;
+    struct ly_set *set;
+
+    assert_int_equal(LY_SUCCESS, ly_in_new_memory(data, &in));
+    assert_int_equal(LY_SUCCESS, lyd_parse_op(UTEST_LYCTX, NULL, in, LYD_XML, LYD_TYPE_REPLY_YANG, &tree, NULL));
+    ly_in_free(in, 0);
+    assert_non_null(tree);
+
+    /* name collision input/output, hashes are not used */
+    assert_int_equal(LY_SUCCESS, lyd_find_xpath(tree, "/a:r/l", &set));
+    assert_int_equal(1, set->count);
+
+    ly_set_free(set, NULL);
+
+    lyd_free_all(tree);
+}
+
 static void
 test_toplevel(void **state)
 {
@@ -481,7 +519,7 @@ test_atomize(void **state)
 
     /* some random paths just making sure the API function works */
     assert_int_equal(LY_SUCCESS, lys_find_xpath_atoms(UTEST_LYCTX, NULL, "/a:*", 0, &set));
-    assert_int_equal(6, set->count);
+    assert_int_equal(7, set->count);
     ly_set_free(set, NULL);
 
     /* all nodes from all modules (including internal, which can change easily, so check just the test modules) */
@@ -498,7 +536,7 @@ test_atomize(void **state)
     ly_set_free(set, NULL);
 
     assert_int_equal(LY_SUCCESS, lys_find_xpath_atoms(UTEST_LYCTX, NULL, "/*", 0, &set));
-    assert_int_equal(13, set->count);
+    assert_int_equal(14, set->count);
     ly_set_free(set, NULL);
 
     /*
@@ -532,7 +570,7 @@ test_atomize(void **state)
 
     /* descendant-or-self */
     assert_int_equal(LY_SUCCESS, lys_find_xpath_atoms(UTEST_LYCTX, NULL, "/a:*/descendant-or-self::c", 0, &set));
-    assert_int_equal(7, set->count);
+    assert_int_equal(8, set->count);
     ly_set_free(set, NULL);
 
     /* following */
@@ -547,11 +585,11 @@ test_atomize(void **state)
 
     /* parent */
     assert_int_equal(LY_SUCCESS, lys_find_xpath_atoms(UTEST_LYCTX, NULL, "/child::a:*/c/parent::l1", 0, &set));
-    assert_int_equal(7, set->count);
+    assert_int_equal(8, set->count);
     ly_set_free(set, NULL);
 
     assert_int_equal(LY_SUCCESS, lys_find_xpath_atoms(UTEST_LYCTX, NULL, "/child::a:c//..", 0, &set));
-    assert_int_equal(8, set->count);
+    assert_int_equal(11, set->count);
     ly_set_free(set, NULL);
 
     /* preceding */
@@ -1062,6 +1100,7 @@ main(void)
         UTEST(test_union, setup),
         UTEST(test_invalid, setup),
         UTEST(test_hash, setup),
+        UTEST(test_rpc, setup),
         UTEST(test_toplevel, setup),
         UTEST(test_atomize, setup),
         UTEST(test_canonize, setup),