commit ba71654577c348ccc3bbfb657bef0488586f80de
author Michal Vasko <mvasko@cesnet.cz> Mon Dec 16 10:01:58 2019 +0100
committer Michal Vasko <mvasko@cesnet.cz> Mon Dec 16 10:01:58 2019 +0100
tree bc8f76f92926db3df998523095ca014a5f752a92
parent 0cbf54fc910bf099583be7c46fbe2ffc74b17427

xpath BUGFIX copying initial context node

Fixes #975

src/xpath.c

diff --git a/src/xpath.c b/src/xpath.c
index ec0f3d3..6f0617f 100644
--- a/src/xpath.c
+++ b/src/xpath.c
@@ -767,6 +767,7 @@
 {
     struct lyxp_set *ret;
     uint16_t i;
+    int idx;
 
     if (!set) {
         return NULL;
@@ -780,11 +781,13 @@
         ret->type = set->type;
 
         for (i = 0; i < set->used; ++i) {
-            if (set->val.scnodes[i].in_ctx == 1) {
-                if (lyxp_set_scnode_insert_node(ret, set->val.scnodes[i].scnode, set->val.scnodes[i].type)) {
+            if ((set->val.scnodes[i].in_ctx == 1) || (set->val.scnodes[i].in_ctx == -2)) {
+                idx = lyxp_set_scnode_insert_node(ret, set->val.scnodes[i].scnode, set->val.scnodes[i].type);
+                if (idx == -1) {
                     lyxp_set_free(ret);
                     return NULL;
                 }
+                ret->val.scnodes[idx].in_ctx = set->val.scnodes[i].in_ctx;
             }
         }
     } else if (set->type == LYXP_SET_NODE_SET) {