Fix several memory corruption issues

diff --git a/src/libstat/backends/mmaped_file.c b/src/libstat/backends/mmaped_file.c
index 5e0b176ef52b9a5d07b1171994d178d8781fa0af..d54d449b23d355b54f53708d125e3c1d0e9fd557 100644 (file)
--- 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 e307c276c9550e48bdf4baadbb70b77d76f16f8b..1646ce3b75395e96787b563d5458a401cf1ad516 100644 (file)
--- 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");