commit 0587bcefa87e8277420e98eab953db33bf8c91af
author Michal Vasko <mvasko@cesnet.cz> Thu Dec 10 12:19:21 2020 +0100
committer Michal Vasko <mvasko@cesnet.cz> Fri Dec 11 11:54:58 2020 +0100
tree 24a554be7ab47af471e177e890ebf0b4f5f10777
parent 5a532f397d5e2189ddd61c78a4fbca4b77f5ee3f

xpath BUGFIX start node proper merge

src/xpath.c

diff --git a/src/xpath.c b/src/xpath.c
index 35c29f4..10d0cdf 100644
--- a/src/xpath.c
+++ b/src/xpath.c
@@ -1116,7 +1116,12 @@
             }
         }
 
-        if (j == orig_used) {
+        if (j < orig_used) {
+            /* node is there, but update its status if needed */
+            if (set1->val.scnodes[j].in_ctx == LYXP_SET_SCNODE_START_USED) {
+                set1->val.scnodes[j].in_ctx = set2->val.scnodes[i].in_ctx;
+            }
+        } else {
             memcpy(&set1->val.scnodes[set1->used], &set2->val.scnodes[i], sizeof *set2->val.scnodes);
             ++set1->used;
         }