commit f66f5bcec74cae5c16a73d2be3070362e305c10d
author Radek Krejci <rkrejci@cesnet.cz> Thu Sep 12 14:50:44 2019 +0200
committer Radek Krejci <rkrejci@cesnet.cz> Thu Sep 12 14:50:44 2019 +0200
tree bee55a7540584ea9dd3b15a5852accb4c5e90dc2
parent 700edb3896fd955915915f09f7c1e6339cd00948
parent 02a7738bdb2c3421c499e1f1dbb67095fe59ffa1

Merge branch 'libyang2' of https://github.com/CESNET/libyang into libyang2

src/xpath.c

diff --git a/src/xpath.c b/src/xpath.c
index 7ec8c0b..da661a9 100644
--- a/src/xpath.c
+++ b/src/xpath.c
@@ -742,11 +742,13 @@
 set_init(struct lyxp_set *new, struct lyxp_set *set)
 {
     memset(new, 0, sizeof *new);
-    new->ctx = set->ctx;
-    new->ctx_node = set->ctx_node;
-    new->local_mod = set->local_mod;
-    new->trees = set->trees;
-    new->format = set->format;
+    if (set) {
+        new->ctx = set->ctx;
+        new->ctx_node = set->ctx_node;
+        new->local_mod = set->local_mod;
+        new->trees = set->trees;
+        new->format = set->format;
+    }
 }
 
 /**
@@ -4086,6 +4088,8 @@
         case LYD_JSON:
             rc = asprintf(&str, "%s:%s", mod->name, name);
             break;
+        default:
+            LOGINT_RET(set->ctx);
         }
         LY_CHECK_ERR_RET(rc == -1, LOGMEM(set->ctx), LY_EMEM);
         set_fill_string(set, str, strlen(str));
@@ -5153,6 +5157,9 @@
         mod = ly_ctx_get_module(ctx, str, NULL);
         free(str);
         break;
+    default:
+        LOGINT(ctx);
+        return NULL;
     }
 
     if (!mod->implemented) {
@@ -6898,7 +6905,7 @@
         break;
 
     default:
-        LOGINT_RET(set->ctx);
+        LOGINT_RET(set ? set->ctx : NULL);
     }
 
     return LY_SUCCESS;
@@ -7158,7 +7165,7 @@
             break;
 
         default:
-            LOGINT_RET(set->ctx);
+            LOGINT_RET(set ? set->ctx : NULL);
         }
     } while ((exp->used > *exp_idx) && (exp->tokens[*exp_idx] == LYXP_TOKEN_OPERATOR_PATH));
 
@@ -7585,7 +7592,7 @@
             if (set) {
                 set_scnode_clear_ctx(set);
             }
-            rc = eval_number(set->ctx, exp, exp_idx, NULL);
+            rc = eval_number(NULL, exp, exp_idx, NULL);
         } else {
             rc = eval_number(set->ctx, exp, exp_idx, set);
         }