BUG/MINOR: snapshots: leak of snapshots on deinit()
authorWilliam Lallemand <wlallemand@haproxy.com>
Fri, 7 Aug 2020 12:48:37 +0000 (14:48 +0200)
committerWilly Tarreau <w@1wt.eu>
Tue, 11 Aug 2020 09:37:55 +0000 (11:37 +0200)
Free the snapshots on deinit() when they were initialized in a proxy
upon an error.

This was introduced by c55015e ("MEDIUM: snapshots: dynamically allocate
the snapshots").

Should be backported as far as 1.9.

(cherry picked from commit efc5a9d55ba46a934f1474802b90c679461ebc92)
Signed-off-by: Willy Tarreau <w@1wt.eu>
(cherry picked from commit 147355c50f5b09bd4251a0f886792f4d7cb82aea)
Signed-off-by: Willy Tarreau <w@1wt.eu>

src/haproxy.c

index 83131eb..ff337a8 100644 (file)
@@ -2548,6 +2548,8 @@ void deinit(void)
                free(p->capture_name);
                free(p->monitor_uri);
                free(p->rdp_cookie_name);
+               free(p->invalid_rep);
+               free(p->invalid_req);
                if (p->conf.logformat_string != default_http_log_format &&
                    p->conf.logformat_string != default_tcp_log_format &&
                    p->conf.logformat_string != clf_http_log_format)