commit 5b998719f19298c5f8df0ecb0be0e6583cbd222a
author Michal Vasko <mvasko@cesnet.cz> Thu Jan 26 10:34:06 2017 +0100
committer Michal Vasko <mvasko@cesnet.cz> Thu Jan 26 10:34:06 2017 +0100
tree 4c8cd8fba1f1a19c98cb7f3ab260f58ed911609e
parent ab8d4d0716f43e78537676550bffda36bada4a98

parser BUGFIX parsing submodules from memory

For YANG we need to add 1 additional \0 at the
end of data for flex.

src/tree_schema.c

diff --git a/src/tree_schema.c b/src/tree_schema.c
index 33df466..87f1945 100644
--- a/src/tree_schema.c
+++ b/src/tree_schema.c
@@ -887,13 +887,28 @@
 }
 
 struct lys_submodule *
-lys_submodule_parse(struct lys_module *module, const char *data, LYS_INFORMAT format, struct unres_schema *unres)
+lys_sub_parse_mem(struct lys_module *module, const char *data, LYS_INFORMAT format, struct unres_schema *unres)
 {
+    char *enlarged_data = NULL;
     struct lys_submodule *submod = NULL;
+    unsigned int len;
 
     assert(module);
     assert(data);
 
+    if (format == LYS_IN_YANG) {
+        /* enlarge data by 2 bytes for flex */
+        len = strlen(data);
+        enlarged_data = malloc((len + 2) * sizeof *enlarged_data);
+        if (!enlarged_data) {
+            LOGMEM;
+            return NULL;
+        }
+        memcpy(enlarged_data, data, len);
+        enlarged_data[len] = enlarged_data[len + 1] = '\0';
+        data = enlarged_data;
+    }
+
     /* get the main module */
     module = lys_main_module(module);
 
@@ -909,6 +924,7 @@
         break;
     }
 
+    free(enlarged_data);
     return submod;
 }
 
@@ -1022,7 +1038,7 @@
 }
 
 struct lys_submodule *
-lys_submodule_read(struct lys_module *module, int fd, LYS_INFORMAT format, struct unres_schema *unres)
+lys_sub_parse_fd(struct lys_module *module, int fd, LYS_INFORMAT format, struct unres_schema *unres)
 {
     struct lys_submodule *submodule;
     struct stat sb;
@@ -1046,9 +1062,23 @@
         LOGERR(LY_EMEM,"Map file into memory failed (%s()).",__func__);
         return NULL;
     }
-    submodule = lys_submodule_parse(module, addr, format, unres);
-    munmap(addr, sb.st_size + 2);
 
+    /* get the main module */
+    module = lys_main_module(module);
+
+    switch (format) {
+    case LYS_IN_YIN:
+        submodule = yin_read_submodule(module, addr, unres);
+        break;
+    case LYS_IN_YANG:
+        submodule = yang_read_submodule(module, addr, 0, unres);
+        break;
+    default:
+        assert(0);
+        break;
+    }
+
+    munmap(addr, sb.st_size + 2);
     return submodule;
 
 }