From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 6 Jan 2016 16:05:16 +0000 (+0000)
Subject: Fix several memory corruption issues
X-Git-Tag: 1.1.0~121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b0615f1d6983ef1c9e3c292c4608d3f37df2172;p=thirdparty%2Frspamd.git

Fix several memory corruption issues
---

diff --git a/src/libstat/backends/mmaped_file.c b/src/libstat/backends/mmaped_file.c
index 5e0b176ef5..d54d449b23 100644
--- a/src/libstat/backends/mmaped_file.c
+++ b/src/libstat/backends/mmaped_file.c
@@ -816,7 +816,10 @@ rspamd_mmaped_file_init (struct rspamd_stat_ctx *ctx,
 
 	size = ucl_object_toint (sizeo);
 	mf = rspamd_mmaped_file_open (cfg->cfg_pool, filename, size, stf);
-	mf->pool = cfg->cfg_pool;
+
+	if (mf != NULL) {
+		mf->pool = cfg->cfg_pool;
+	}
 
 	return (gpointer)mf;
 }
diff --git a/src/libstat/stat_config.c b/src/libstat/stat_config.c
index e307c276c9..1646ce3b75 100644
--- a/src/libstat/stat_config.c
+++ b/src/libstat/stat_config.c
@@ -143,6 +143,7 @@ rspamd_stat_init (struct rspamd_config *cfg, struct event_base *ev_base)
 		/* Init classifier cache */
 		if (clf->opts) {
 			cache_obj = ucl_object_find_key (clf->opts, "cache");
+			cache_name_obj = NULL;
 
 			if (cache_obj) {
 				cache_name_obj = ucl_object_find_key (cache_obj, "name");