From a741d53028690f267db276d3ca62ac0b02ba0cdb Mon Sep 17 00:00:00 2001
From: Sergey Lyubka <valenok@gmail.com>
Date: Fri, 10 Jan 2014 11:23:29 +0000
Subject: [PATCH] Fixed leak for server creation/destroy
---
build/test/test.pl | 3 +--
mongoose.c | 5 +++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/build/test/test.pl b/build/test/test.pl
index eb8b62cdd..5166c31e7 100644
--- a/build/test/test.pl
+++ b/build/test/test.pl
@@ -361,8 +361,7 @@ unless (scalar(@ARGV) > 0 and $ARGV[0] eq "basic_tests") {
o("GET /dir%20with%20spaces/hello.cgi HTTP/1.0\n\r\n",
'HTTP/1.1 200 OK.+hello', 'CGI script with spaces in path');
o("GET /env.cgi HTTP/1.0\n\r\n", 'HTTP/1.1 200 OK', 'GET CGI file');
- o("GET /bad2.cgi HTTP/1.0\n\n", "HTTP/1.1 302 Please pass me to the client\r",
- 'CGI Status code text');
+ o("GET /bad2.cgi HTTP/1.0\n\n", "^HTTP/1.1 302", 'CGI Status code');
o("GET /sh.cgi HTTP/1.0\n\r\n", 'shell script CGI',
'GET sh CGI file') unless on_windows();
o("GET /env.cgi?var=HELLO HTTP/1.0\n\n", 'QUERY_STRING=var=HELLO',
diff --git a/mongoose.c b/mongoose.c
index e972d2941..95ecb1838 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -3532,6 +3532,7 @@ unsigned int mg_poll_server(struct mg_server *server, int milliseconds) {
}
void mg_destroy_server(struct mg_server **server) {
+ int i;
struct ll *lp, *tmp;
if (server != NULL && *server != NULL) {
@@ -3542,8 +3543,12 @@ void mg_destroy_server(struct mg_server **server) {
free(LINKED_LIST_ENTRY(lp, struct connection, link));
}
LINKED_LIST_FOREACH(&(*server)->uri_handlers, lp, tmp) {
+ free(LINKED_LIST_ENTRY(lp, struct uri_handler, link)->uri);
free(LINKED_LIST_ENTRY(lp, struct uri_handler, link));
}
+ for (i = 0; i < (int) ARRAY_SIZE((*server)->config_options); i++) {
+ free((*server)->config_options[i]); // It is OK to free(NULL)
+ }
#ifdef USE_SSL
if ((*server)->ssl_ctx != NULL) SSL_CTX_free((*server)->ssl_ctx);
#endif
--
GitLab