Merge pull request #1 from mborodin/v3.7.2-knc-memleak Memory leaks fixed
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68
diff --git a/api.c b/api.c
index 07f6c39..c811c61 100644
--- a/api.c
+++ b/api.c
@@ -719,6 +719,7 @@ static void io_free()
do {
io_next = io_list->next;
+ free(io_list->io_data->ptr);
free(io_list->io_data);
free(io_list);
@@ -4395,6 +4396,7 @@ void api(int api_thr_id)
if (!opt_api_listen) {
applog(LOG_DEBUG, "API not running%s", UNAVAILABLE);
+ free(apisock);
return;
}
@@ -4412,6 +4414,7 @@ void api(int api_thr_id)
if (ips == 0) {
applog(LOG_WARNING, "API not running (no valid IPs specified)%s", UNAVAILABLE);
+ free(apisock);
return;
}
}
@@ -4423,6 +4426,7 @@ void api(int api_thr_id)
*apisock = socket(AF_INET, SOCK_STREAM, 0);
if (*apisock == INVSOCK) {
applog(LOG_ERR, "API1 initialisation failed (%s)%s", SOCKERRMSG, UNAVAILABLE);
+ free(apisock);
return;
}
@@ -4434,6 +4438,7 @@ void api(int api_thr_id)
serv.sin_addr.s_addr = inet_addr(localaddr);
if (serv.sin_addr.s_addr == (in_addr_t)INVINETADDR) {
applog(LOG_ERR, "API2 initialisation failed (%s)%s", SOCKERRMSG, UNAVAILABLE);
+ free(apisock);
return;
}
}
@@ -4472,12 +4477,14 @@ void api(int api_thr_id)
if (bound == 0) {
applog(LOG_ERR, "API bind to port %d failed (%s)%s", port, binderror, UNAVAILABLE);
+ free(apisock);
return;
}
if (SOCKETFAIL(listen(*apisock, QUEUE))) {
applog(LOG_ERR, "API3 initialisation failed (%s)%s", SOCKERRMSG, UNAVAILABLE);
CLOSESOCKET(*apisock);
+ free(apisock);
return;
}
@@ -4614,6 +4621,8 @@ die:
;
pthread_cleanup_pop(true);
+ free(apisock);
+
if (opt_debug)
applog(LOG_DEBUG, "API: terminating due to: %s",
do_a_quit ? "QUIT" : (do_a_restart ? "RESTART" : (bye ? "BYE" : "UNKNOWN!")));