From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 27 Jan 2017 18:02:58 +0000 (+0000)
Subject: [Fix] Fix memory leak in HTTP maps
X-Git-Tag: 1.4.4~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8b9cf048ff2cc0015ee83e65dd83b2d30c35a97;p=thirdparty%2Frspamd.git

[Fix] Fix memory leak in HTTP maps

Issue: #1332
---

diff --git a/src/libutil/map.c b/src/libutil/map.c
index 439a13e949..af83cc4d13 100644
--- a/src/libutil/map.c
+++ b/src/libutil/map.c
@@ -97,7 +97,8 @@ write_http_request (struct http_callback_data *cbd)
 		}
 
 		if (cbd->stage == map_load_file) {
-			msg->url = rspamd_fstring_new_init (cbd->data->path, strlen (cbd->data->path));
+			msg->url = rspamd_fstring_append (msg->url,
+					cbd->data->path, strlen (cbd->data->path));
 
 			if (cbd->check &&
 					cbd->data->last_checked != 0 && cbd->stage == map_load_file) {
@@ -107,11 +108,13 @@ write_http_request (struct http_callback_data *cbd)
 			}
 		}
 		else if (cbd->stage == map_load_pubkey) {
-			msg->url = rspamd_fstring_new_init (cbd->data->path, strlen (cbd->data->path));
+			msg->url = rspamd_fstring_append (msg->url,
+					cbd->data->path, strlen (cbd->data->path));
 			msg->url = rspamd_fstring_append (msg->url, ".pub", 4);
 		}
 		else if (cbd->stage == map_load_signature) {
-			msg->url = rspamd_fstring_new_init (cbd->data->path, strlen (cbd->data->path));
+			msg->url = rspamd_fstring_append (msg->url,
+					cbd->data->path, strlen (cbd->data->path));
 			msg->url = rspamd_fstring_append (msg->url, ".sig", 4);
 		}
 		else {
diff --git a/src/libutil/ssl_util.c b/src/libutil/ssl_util.c
index 6f00e16216..828250e501 100644
--- a/src/libutil/ssl_util.c
+++ b/src/libutil/ssl_util.c
@@ -16,6 +16,7 @@
 
 #include "config.h"
 #include "libutil/util.h"
+#include "libutil/logger.h"
 #include "ssl_util.h"
 
 #include <openssl/ssl.h>
@@ -365,7 +366,7 @@ rspamd_ssl_event_handler (gint fd, short what, gpointer ud)
 				c->handler (fd, EV_WRITE, c->handler_data);
 			}
 			else {
-				g_assert (0);
+				return;
 			}
 		}
 		else {
@@ -703,6 +704,7 @@ void
 rspamd_ssl_connection_free (struct rspamd_ssl_connection *conn)
 {
 	if (conn) {
+		SSL_shutdown (conn->ssl);
 		SSL_free (conn->ssl);
 
 		if (conn->hostname) {