BUG/MEDIUM: dns: Release answer items when a DNS resolution is freed
When a DNS resolution is freed, the remaining items in .ar_list and .answer_list
are also released. It must be done to avoid a memory leak. And it is the last
chance to release these objects. I've honestly no idea if there is a better
place to release them earlier. But at least, there is no more leak.
This patch should solve the issue #222. It must be backported, at least, as far
as 2.0, and probably, with caution, as far as 1.8 or 1.7.
(cherry picked from commit 010ab35a9118daf17a670fb2b42e40447f967f7c)
Signed-off-by: Willy Tarreau <w@1wt.eu>
(cherry picked from commit c58ac80d00284886b108b209a5bf993de5ab38ed)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 81120e6ea286ae3f2566959167fb56a7d1f0de19)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
diff --git a/src/dns.c b/src/dns.c
index 40e29ad..18e64d9 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -1336,6 +1336,7 @@
static void dns_free_resolution(struct dns_resolution *resolution)
{
struct dns_requester *req, *reqback;
+ struct dns_answer_item *item, *itemback;
/* clean up configuration */
dns_reset_resolution(resolution);
@@ -1347,6 +1348,11 @@
req->resolution = NULL;
}
+ list_for_each_entry_safe(item, itemback, &resolution->response.answer_list, list) {
+ LIST_DEL(&item->list);
+ pool_free(dns_answer_item_pool, item);
+ }
+
LIST_DEL(&resolution->list);
pool_free(dns_resolution_pool, resolution);
}