commit 13b1583c036660a697b77fe578b4656aeb295176
author Michal Vasko <mvasko@cesnet.cz> Wed Aug 19 11:04:48 2015 +0200
committer Michal Vasko <mvasko@cesnet.cz> Wed Aug 19 11:04:48 2015 +0200
tree 97dcd5c1bb92bf21368261d6d3f94a419571e553
parent 1433a0cefb359e66982e3dde8f9326a60f2809d5

schema tree BUGFIX internal mods freeing

We actually need to free the internal mods
too if the whole context gets destroyed,
a flag introduced for this.

src/tree.c

diff --git a/src/tree.c b/src/tree.c
index f4cdd7a..fd30b43 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -751,7 +751,7 @@
     }
 
     if (mod && unres->count && resolve_unres(mod, unres)) {
-        lys_free(mod);
+        lys_free(mod, 0);
         mod = NULL;
     }
     free(unres->item);
@@ -787,7 +787,7 @@
     }
 
    if (submod && unres->count && resolve_unres((struct lys_module *)submod, unres)) {
-        lys_submodule_free(submod);
+        lys_submodule_free(submod, 0);
         submod = NULL;
     }
     free(unres->item);
@@ -1552,8 +1552,9 @@
     free(node);
 }
 
+/* free_int_mods - flag whether to free the internal modules as well */
 static void
-module_free_common(struct lys_module *module)
+module_free_common(struct lys_module *module, int free_int_mods)
 {
     struct ly_ctx *ctx;
     unsigned int i;
@@ -1565,7 +1566,7 @@
     /* as first step, free the imported modules */
     for (i = 0; i < module->imp_size; i++) {
         /* do not free internal modules */
-        for (j = 0; j < int_mods.count; ++j) {
+        for (j = 0; !free_int_mods && (j < int_mods.count); ++j) {
             if (!strcmp(int_mods.modules[j].name, module->imp[i].module->name)
                     && module->imp[i].module->rev
                     && !strcmp(int_mods.modules[j].revision, module->imp[i].module->rev[0].date)) {
@@ -1583,7 +1584,7 @@
         l = ctx->models.used;
         for (j = 0; j < l; j++) {
             if (ctx->models.list[j] == module->imp[i].module) {
-                lys_free(module->imp[i].module);
+                lys_free(module->imp[i].module, free_int_mods);
                 break;
             }
         }
@@ -1627,7 +1628,7 @@
 
     /* include */
     for (i = 0; i < module->inc_size; i++) {
-        lys_submodule_free(module->inc[i].submodule);
+        lys_submodule_free(module->inc[i].submodule, free_int_mods);
     }
     free(module->inc);
 
@@ -1653,7 +1654,7 @@
 }
 
 void
-lys_submodule_free(struct lys_submodule *submodule)
+lys_submodule_free(struct lys_submodule *submodule, int free_int_mods)
 {
     if (!submodule) {
         return;
@@ -1664,7 +1665,7 @@
     submodule->inc = NULL;
 
     /* common part with struct ly_module */
-    module_free_common((struct lys_module *)submodule);
+    module_free_common((struct lys_module *)submodule, free_int_mods);
 
     /* no specific items to free */
 
@@ -2136,8 +2137,8 @@
     return NULL;
 }
 
-API void
-lys_free(struct lys_module *module)
+void
+lys_free(struct lys_module *module, int free_int_mods)
 {
     struct ly_ctx *ctx;
     int i;
@@ -2162,7 +2163,7 @@
     }
 
     /* common part with struct ly_submodule */
-    module_free_common(module);
+    module_free_common(module, free_int_mods);
 
     /* specific items to free */
     lydict_remove(module->ctx, module->ns);