upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-25 17:19:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

and fixup delete rest of list on parse failure.

Browse source 
git-svn-id: file:///svn/unbound/trunk@3762 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2016-06-06 15:01:48 +00:00
parent 2cc017981b
commit a2555b39d7
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/acl_list.c
View file

@ -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);

3
util/config_file.c
View file

@ -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;

3
util/config_file.h
View file

@ -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