and fixup delete rest of list on parse failure.

git-svn-id: file:///svn/unbound/trunk@3762 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/daemon/acl_list.c b/daemon/acl_list.c
index 4d40b092c946fa41ee8f97fa2a0a15f997762496..98be99b35b3835c4a18c305984f2993b4438c31f 100644 (file)
--- a/daemon/acl_list.c
+++ b/daemon/acl_list.c
@@ -298,8 +298,10 @@ read_acl_tags(struct acl_list* acl, struct config_file* cfg)
        cfg->acl_tags = NULL;
        while(p) {
                log_assert(p->str && p->str2);
-               if(!acl_list_tags_cfg(acl, p->str, p->str2, p->str2len))
+               if(!acl_list_tags_cfg(acl, p->str, p->str2, p->str2len)) {
+                       config_del_strbytelist(p);
                        return 0;
+               }
                /* free the items as we go to free up memory */
                np = p->next;
                free(p->str);

diff --git a/util/config_file.c b/util/config_file.c
index 90ab61d8c7718c50011684709956df9ae4c90650..4754e2d51dff894834134b6b7b9b61222af4e8bd 100644 (file)
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -996,8 +996,7 @@ config_del_strarray(char** array, int num)
        free(array);
 }
 
-/** delete stringbytelist */
-static void
+void
 config_del_strbytelist(struct config_strbytelist* p)
 {
        struct config_strbytelist* np;

diff --git a/util/config_file.h b/util/config_file.h
index 2483581e6108e78a04fbd608fd1e5f34861092ed..505c66f88eaeacb51c3497d713c48495eec4fa6f 100644 (file)
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -664,6 +664,9 @@ void config_deldblstrlist(struct config_str2list* list);
  */
 void config_deltrplstrlist(struct config_str3list* list);
 
+/** delete stringbytelist */
+void config_del_strbytelist(struct config_strbytelist* list);
+
 /**
  * Delete a stub item
  * @param p: stub item