CLEANUP: deinit: release global and per-proxy server-state variables on deinit

The global server-state base directory and file name are now released on
deinit, as well as per-proxy server-state file name.

(cherry picked from commit f5ea269723a205c22d1ac9fd40b8d7fab5cb47ed)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 3dab6c0c9f345ee8dc72ee8f7072521210434cf4)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit ba56cfd29574d6015ce8eb9278a971758c8c1788)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

diff --git a/src/haproxy.c b/src/haproxy.c
index 07bb670..a55c90c 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -2572,6 +2572,7 @@ void deinit(void)
                free(p->cookie_domain);
                free(p->cookie_attrs);
                free(p->lbprm.arg_str);
+               free(p->server_state_file_name);
                free(p->capture_name);
                free(p->monitor_uri);
                free(p->rdp_cookie_name);
@@ -2819,6 +2820,8 @@ void deinit(void)
        free(global.desc);    global.desc = NULL;
        free(oldpids);        oldpids = NULL;
        task_destroy(global_listener_queue_task); global_listener_queue_task = NULL;
+       free(global.server_state_base); global.server_state_base = NULL;
+       free(global.server_state_file); global.server_state_file = NULL;
        task_destroy(idle_conn_task);
        idle_conn_task = NULL;