30 lines
960 B
Diff
30 lines
960 B
Diff
|
From 25d0a14ada411dc73b55b55d5b27599ccd2fa4a2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Godbach <nylzhaowei@gmail.com>
|
||
|
|
Date: Wed, 26 Jun 2013 16:49:51 +0800
|
||
|
|
Subject: [PATCH 4/9] BUG/MINOR: deinit: free fdinfo while doing cleanup
|
||
|
|
|
||
|
|
Both fdinfo and fdtab are allocated memory in init() while haproxy is starting,
|
||
|
|
but only fdtab is freed in deinit(), fdinfo should also be freed.
|
||
|
|
|
||
|
|
Signed-off-by: Godbach <nylzhaowei@gmail.com>
|
||
|
|
(cherry picked from commit 4cc1b0d4ef283b5ace5249483ec7eb3b1fc5d193)
|
||
|
|
---
|
||
|
|
src/haproxy.c | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/src/haproxy.c b/src/haproxy.c
|
||
|
|
index 7a09e3f..c163743 100644
|
||
|
|
--- a/src/haproxy.c
|
||
|
|
+++ b/src/haproxy.c
|
||
|
|
@@ -941,6 +941,7 @@ void deinit(void)
|
||
|
|
free(global.pidfile); global.pidfile = NULL;
|
||
|
|
free(global.node); global.node = NULL;
|
||
|
|
free(global.desc); global.desc = NULL;
|
||
|
|
+ free(fdinfo); fdinfo = NULL;
|
||
|
|
free(fdtab); fdtab = NULL;
|
||
|
|
free(oldpids); oldpids = NULL;
|
||
|
|
|
||
|
|
--
|
||
|
|
1.8.1.5
|
||
|
|
|