From: Thomas Holmes <tom@51degrees.com>
Date: Thu, 14 May 2015 16:14:30 +0000 (+0100)
Subject: MEDIUM: deinit: add cleanup for 51Degrees to deinit
X-Git-Tag: v1.6-dev2~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ed33eed536f8cf361404d296cd08fd09997da36;p=thirdparty%2Fhaproxy.git

MEDIUM: deinit: add cleanup for 51Degrees to deinit
---

diff --git a/src/haproxy.c b/src/haproxy.c
index ecdf20603d..daf68d0b65 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1231,6 +1231,7 @@ void deinit(void)
 	struct logsrv *log, *logb;
 	struct logformat_node *lf, *lfb;
 	struct bind_conf *bind_conf, *bind_back;
+	struct _51d_property_names *_51d_prop_name, *_51d_prop_nameb;
 	int i;
 
 	deinit_signals();
@@ -1486,6 +1487,15 @@ void deinit(void)
 	deinit_deviceatlas();
 #endif
 
+#ifdef USE_51DEGREES
+	fiftyoneDegreesDestroy(&global._51d_data_set);
+	free(global._51d_data_file_path); global._51d_data_file_path = NULL;
+	list_for_each_entry_safe(_51d_prop_name, _51d_prop_nameb, &global._51d_property_names, list) {
+		LIST_DEL(&_51d_prop_name->list);
+		free(_51d_prop_name);
+	}
+#endif
+
 	free(global.log_send_hostname); global.log_send_hostname = NULL;
 	free(global.log_tag); global.log_tag = NULL;
 	free(global.chroot);  global.chroot = NULL;