sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "res_resolver_unbound: Fix leak of config nameserver strings." into 16

This commit is contained in:
Joshua Colp 2018-08-17 05:39:53 -05:00 committed by Gerrit Code Review
parent 14da6be84d 167efe3a47
commit 7d8e2389d6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
res/res_resolver_unbound.c
View File

@ -432,20 +432,22 @@ static int unbound_config_preapply(struct unbound_config *cfg)
if (cfg->global->nameservers) {
struct ao2_iterator it_nameservers;
const char *nameserver;
char *nameserver;
it_nameservers = ao2_iterator_init(cfg->global->nameservers, 0);
while ((nameserver = ao2_iterator_next(&it_nameservers))) {
while (!res && (nameserver = ao2_iterator_next(&it_nameservers))) {
res = ub_ctx_set_fwd(cfg->global->state->resolver->context, (UNBOUND_CHAR *)nameserver);
if (res) {
ast_log(LOG_ERROR, "Failed to add nameserver '%s' to unbound resolver: %s\n",
nameserver, ub_strerror(res));
ao2_iterator_destroy(&it_nameservers);
return -1;
}
ao2_ref(nameserver, -1);
}
ao2_iterator_destroy(&it_nameservers);
if (res) {
return -1;
}
}
if (!strcmp(cfg->global->resolv, "system")) {