commit c7d13e388c064c50efb04122e3ecb86ee3bdfbd2
author Radek Krejci <rkrejci@cesnet.cz> Wed Dec 09 12:32:24 2020 +0100
committer Michal Vasko <mvasko@cesnet.cz> Wed Dec 09 16:36:23 2020 +0100
tree 844200c543fb5c659182657c6dee9210cfdf63b0
parent 29adfbe533cf5f1563e39ee4afb6e8fbf5a5505f

tree CHANGE test for NULL in LY_ARRAY_COUNT() macro

Make it more safe in cost of losing possibility to use macro as lvalue.

src/parser_lyb.c

diff --git a/src/parser_lyb.c b/src/parser_lyb.c
index 8a54c6e..c7a64b3 100644
--- a/src/parser_lyb.c
+++ b/src/parser_lyb.c
@@ -246,12 +246,7 @@
     uint8_t meta_buf[LYB_META_BYTES];
     LY_ARRAY_COUNT_TYPE u;
 
-    if (!lybctx->subtrees) {
-        assert(lybctx->subtree_size == 0);
-        u = 0;
-    } else {
-        u = LY_ARRAY_COUNT(lybctx->subtrees);
-    }
+    u = LY_ARRAY_COUNT(lybctx->subtrees);
     if (u == lybctx->subtree_size) {
         LY_ARRAY_CREATE_RET(lybctx->ctx, lybctx->subtrees, u + LYB_SUBTREE_STEP, LY_EMEM);
         lybctx->subtree_size = u + LYB_SUBTREE_STEP;