commit d421976e793774bcc3267f838b495d6ae6c8b62d
author Fred Gan <ganshaolong@vip.qq.com> Wed Jan 27 15:30:18 2021 +0800
committer Michal Vasko <mvasko@cesnet.cz> Wed Jan 27 15:40:54 2021 +0100
tree 5c7529c77961bc39e980bea4e96b4caa205ed4d4
parent 45b212be5e65ac8ac175b3024155b398c06c362e

printer json BUGFIX specific cases invalid print (#1369)

src/printer_json.c

diff --git a/src/printer_json.c b/src/printer_json.c
index 23a6750..10b8bdf 100644
--- a/src/printer_json.c
+++ b/src/printer_json.c
@@ -228,6 +228,14 @@
         ly_print(out, "[null]");
         break;
 
+    case LY_TYPE_UNKNOWN:
+        if (leaf->value_str[0] == '\0') {
+            ly_write(out, "\"\"", 2);
+            break;
+        }
+        datatype = ((struct lys_node_leaf *)leaf->schema)->type.base;
+        goto contentprint;
+
     default:
         /* error */
         LOGINT(node->schema->module->ctx);
@@ -275,9 +283,7 @@
             return EXIT_FAILURE;
         }
         ly_print(out, "%*s}", LEVEL, INDENT);
-        if (node->child) {
-            ly_print(out, ",%s", (level ? "\n" : ""));
-        }
+        ly_print(out, "%s%s", (node->child? "," : ""), (level ? "\n" : ""));
     }
     if (json_print_nodes(out, level, node->child, 1, 0, options)) {
         return EXIT_FAILURE;
@@ -313,7 +319,7 @@
     }
 
     if (flag_empty) {
-        ly_print(out, "%snull", (level ? " " : ""));
+        ly_print(out, "%s[]", (level ? " " : ""));
         goto finish;
     }
     ly_print(out, "%s[%s", (level ? " " : ""), (level ? "\n" : ""));
@@ -491,25 +497,46 @@
     }
 
     /* print attributes as sibling leaf */
-    if (node->attr) {
-        if (schema) {
-            ly_print(out, ",%s%*s\"@%s:%s\":%s{%s", (level ? "\n" : ""), LEVEL, INDENT, schema, node->schema->name,
-                     (level ? " " : ""), (level ? "\n" : ""));
-        } else {
-            ly_print(out, ",%s%*s\"@%s\":%s{%s", (level ? "\n" : ""), LEVEL, INDENT, node->schema->name,
-                     (level ? " " : ""), (level ? "\n" : ""));
+    switch(node->schema->nodetype) {
+    case LYS_ANYXML:
+        if (level) {
+            level--;
         }
-        if (json_print_attrs(out, (level ? level + 1 : level), node, NULL)) {
-            return EXIT_FAILURE;
+        if (is_object) {
+             ly_print(out, "%*s}", LEVEL, INDENT);
         }
-        ly_print(out, "%*s}", LEVEL, INDENT);
-    }
-
-    if (level) {
-        level--;
-    }
-    if (is_object) {
-        ly_print(out, "%*s}", LEVEL, INDENT);
+        if (node->attr) {
+            if (schema) {
+                ly_print(out, ",%s%*s\"@%s:%s\":%s{%s", (level ? "\n" : ""), LEVEL, INDENT, schema, node->schema->name,
+                         (level ? " " : ""), (level ? "\n" : ""));
+            } else {
+                ly_print(out, ",%s%*s\"@%s\":%s{%s", (level ? "\n" : ""), LEVEL, INDENT, node->schema->name,
+                         (level ? " " : ""), (level ? "\n" : ""));
+            }
+            if (json_print_attrs(out, (level ? level + 1 : level), node, NULL)) {
+                return EXIT_FAILURE;
+            }
+            ly_print(out, "%*s}", LEVEL, INDENT);
+        }
+        break;
+    case LYS_ANYDATA:
+        if (node->attr) {
+            ly_print(out, ",%s%*s\"@\":%s{%s", (level ? "\n" : ""), LEVEL, INDENT, (level ? " " : ""), (level ? "\n" : ""));
+            if (json_print_attrs(out, (level ? level + 1 : level), node, NULL)) {
+                return EXIT_FAILURE;
+            }
+            ly_print(out, "%*s}", LEVEL, INDENT);
+        }
+        if (level) {
+            level--;
+        }
+        if (is_object) {
+            ly_print(out, "%s%*s}", (level ? "\n" : ""), LEVEL, INDENT);
+        }
+        break;
+    default:
+        LOGINT(node->schema->module->ctx);
+        return EXIT_FAILURE;
     }
 
     LY_PRINT_RET(node->schema->module->ctx);