commit f6d14cba3c8a20d89aaa21c74985259bd40125f7
author Radek Krejci <rkrejci@cesnet.cz> Thu Jul 02 16:11:45 2020 +0200
committer Radek Krejci <rkrejci@cesnet.cz> Thu Jul 02 16:11:45 2020 +0200
tree dc3a3bd7c41d87d598819e9ab3f02a5052b8998c
parent 7931b19ff440b35b7e7b761fbadd5433d01af201

libyang BUGFIX NULL-pointer dereference

reported by coverity

src/parser_lyb.c

diff --git a/src/parser_lyb.c b/src/parser_lyb.c
index d9366f8..b2aca77 100644
--- a/src/parser_lyb.c
+++ b/src/parser_lyb.c
@@ -223,6 +223,7 @@
     LY_ARRAY_SIZE_TYPE u;
 
     if (!lybctx->subtrees) {
+        assert(lybctx->subtree_size == 0);
         u = 0;
     } else {
         u = LY_ARRAY_SIZE(lybctx->subtrees);

src/printer_lyb.c

diff --git a/src/printer_lyb.c b/src/printer_lyb.c
index dc03f61..ba2ad27 100644
--- a/src/printer_lyb.c
+++ b/src/printer_lyb.c
@@ -342,6 +342,7 @@
     LY_ARRAY_SIZE_TYPE u;
 
     if (!lybctx->subtrees) {
+        assert(lybctx->subtree_size == 0);
         u = 0;
     } else {
         u = LY_ARRAY_SIZE(lybctx->subtrees);

src/tree_data.c

diff --git a/src/tree_data.c b/src/tree_data.c
index b558038..7fb5d58 100644
--- a/src/tree_data.c
+++ b/src/tree_data.c
@@ -1467,13 +1467,13 @@
     if (parent) {
         /* inner node */
         if (par2 != parent) {
-            LOGERR(parent->module->ctx, LY_EINVAL, "Cannot insert, parent of \"%s\" is not \"%s\".", schema->name, parent->name);
+            LOGERR(schema->module->ctx, LY_EINVAL, "Cannot insert, parent of \"%s\" is not \"%s\".", schema->name, parent->name);
             return LY_EINVAL;
         }
     } else {
         /* top-level node */
         if (par2) {
-            LOGERR(parent->module->ctx, LY_EINVAL, "Cannot insert, node \"%s\" is not top-level.", schema->name);
+            LOGERR(schema->module->ctx, LY_EINVAL, "Cannot insert, node \"%s\" is not top-level.", schema->name);
             return LY_EINVAL;
         }
     }