Merge pull request #9721 from yuwata/fix-resolve-memleak

Fix resolve memleak
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-07-26 14:22:15 +02:00 committed by GitHub
commit 4ee35e4e53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions

View File

@ -79,7 +79,7 @@ static const struct hash_ops etc_hosts_item_ops = {
};
static int add_item(Manager *m, int family, const union in_addr_union *address, char **names) {
_cleanup_strv_free_ char **dummy = names;
EtcHostsItem key = {
.family = family,
.address = *address,
@ -112,19 +112,23 @@ static int add_item(Manager *m, int family, const union in_addr_union *address,
if (r < 0)
return log_oom();
item = new0(EtcHostsItem, 1);
item = new(EtcHostsItem, 1);
if (!item)
return log_oom();
item->family = family;
item->address = *address;
item->names = names;
*item = (EtcHostsItem) {
.family = family,
.address = *address,
.names = names,
};
r = set_put(m->etc_hosts_by_address, item);
if (r < 0) {
free(item);
return log_oom();
}
dummy = NULL;
}
}