commit 6a5e469051575c338df4fc7d018dc54f918f59ab
author Michal Vasko <mvasko@cesnet.cz> Wed Mar 01 14:41:39 2023 +0100
committer Michal Vasko <mvasko@cesnet.cz> Wed Mar 01 14:41:39 2023 +0100
tree b1f62286213df97d3cb2ae678be77762968ef695
parent 58a1a7090bf18436cd994898a8e3a1150c8ecf77

parser json BUGFIX multi-err validation for list without keys

Refs #1978

src/parser_json.c

diff --git a/src/parser_json.c b/src/parser_json.c
index 8ebd3c4..4c9858e 100644
--- a/src/parser_json.c
+++ b/src/parser_json.c
@@ -1403,6 +1403,11 @@
 cleanup:
     lydctx->parse_opts = prev_parse_opts;
     LOG_LOCBACK(0, 1, 0, 0);
+    if (!(*node)->hash) {
+        /* list without keys is unusable */
+        lyd_free_tree(*node);
+        *node = NULL;
+    }
     return rc;
 }
 
@@ -1797,21 +1802,17 @@
     LY_CHECK_GOTO(rc = lyd_parser_find_operation(parent, int_opts, &lydctx->op_node), cleanup);
 
     /* read subtree(s) */
-    while (lydctx->jsonctx->in->current[0]) {
+    while (status == LYJSON_OBJECT) {
         r = lydjson_subtree_r(lydctx, parent, first_p, parsed);
         LY_DPARSER_ERR_GOTO(r, rc = r, lydctx, cleanup);
 
         status = lyjson_ctx_status(lydctx->jsonctx, 0);
-        if (status == LYJSON_OBJECT_CLOSED) {
-            break;
-        } else if (status != LYJSON_OBJECT) {
-            /* fatal error for multi-error validation */
-            assert(lydctx->val_opts & LYD_VALIDATE_MULTI_ERROR);
-            goto cleanup;
-        } else if (!(int_opts & LYD_INTOPT_WITH_SIBLINGS)) {
+
+        if (!(int_opts & LYD_INTOPT_WITH_SIBLINGS)) {
             break;
         }
     }
+    assert((status == LYJSON_END) || (status == LYJSON_OBJECT_CLOSED));
 
     if ((int_opts & LYD_INTOPT_NO_SIBLINGS) && lydctx->jsonctx->in->current[0] &&
             (lyjson_ctx_status(lydctx->jsonctx, 0) != LYJSON_OBJECT_CLOSED)) {