From: Thayne McCombs <thayne@lucidchart.com>
Date: Fri, 8 Jan 2021 05:11:05 +0000 (-0700)
Subject: BUG/MINOR: server: Memory leak of proxy.used_server_addr during deinit
X-Git-Tag: v2.4-dev6~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4fb255df03f439c5da0446f2b017191c637b2b7b;p=thirdparty%2Fhaproxy.git

BUG/MINOR: server: Memory leak of proxy.used_server_addr during deinit

GitHub Issue #1037 Reported a memory leak in deinit() caused by an
allocation made in sa2str() that was stored in srv_set_addr_desc().

When destroying each server for a proxy in deinit, include freeing the
memory in the key of server->addr_node.

The leak was introduced in commit 92149f9a8 ("MEDIUM: stick-tables: Add
srvkey option to stick-table") which is not in any released version so
no backport is needed.

Cc: Tim Duesterhus <tim@bastelstu.be>
---

diff --git a/src/haproxy.c b/src/haproxy.c
index fb73c54440..fcc4f6c709 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -2649,6 +2649,7 @@ void deinit(void)
 			free(s->available_conns);
 			free(s->curr_idle_thr);
 			free(s->resolvers_id);
+			free(s->addr_node.key);
 
 			if (s->use_ssl == 1 || s->check.use_ssl == 1 || (s->proxy->options & PR_O_TCPCHK_SSL)) {
 				if (xprt_get(XPRT_SSL) && xprt_get(XPRT_SSL)->destroy_srv)