diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-06-17 12:16:29 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-06-17 12:16:48 +0100 |
| commit | d20c466cd2d98a5f8abb9bdb9c85902b258cc563 (patch) | |
| tree | 988ee900ec19827bea06eddb1bdc7f82483b6404 | |
| parent | d20163c2280d8f28fe63e83355b4c58b6fc52362 (diff) | |
| download | rspamd-d20c466cd2d98a5f8abb9bdb9c85902b258cc563.tar.gz rspamd-d20c466cd2d98a5f8abb9bdb9c85902b258cc563.zip | |
[Minor] Fix various settings issues
| -rw-r--r-- | src/libserver/rspamd_symcache.c | 6 | ||||
| -rw-r--r-- | src/lua/lua_common.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/libserver/rspamd_symcache.c b/src/libserver/rspamd_symcache.c index 3560957af..5a4a002c3 100644 --- a/src/libserver/rspamd_symcache.c +++ b/src/libserver/rspamd_symcache.c @@ -3203,7 +3203,8 @@ rspamd_symcache_add_id_to_list (rspamd_mempool_t *pool, g_assert (ls->dyn.allocated <= G_MAXINT16); ls->dyn.allocated *= 2; - new_array = rspamd_mempool_alloc (pool, ls->dyn.allocated); + new_array = rspamd_mempool_alloc (pool, + ls->dyn.allocated * sizeof (guint32)); memcpy (new_array, ls->dyn.n, ls->dyn.len * sizeof (guint32)); ls->dyn.n = new_array; ls->dyn.n[ls->dyn.len++] = id; @@ -3222,7 +3223,8 @@ rspamd_symcache_add_id_to_list (rspamd_mempool_t *pool, } else { /* Switch to dynamic */ - new_array = rspamd_mempool_alloc (pool, G_N_ELEMENTS (ls->st) * 2); + new_array = rspamd_mempool_alloc (pool, + G_N_ELEMENTS (ls->st) * 2 * sizeof (guint32)); memcpy (new_array, ls->st, G_N_ELEMENTS (ls->st) * sizeof (guint32)); ls->dyn.n = new_array; ls->dyn.e = -1; diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c index a912fb5b5..7e7a2854f 100644 --- a/src/lua/lua_common.c +++ b/src/lua/lua_common.c @@ -1902,7 +1902,7 @@ rspamd_lua_run_config_unload (lua_State *L, struct rspamd_config *cfg) struct rspamd_config_cfg_lua_script *sc; struct rspamd_config **pcfg; - LL_FOREACH (cfg->post_init_scripts, sc) { + LL_FOREACH (cfg->config_unload_scripts, sc) { lua_pushcfunction (L, &rspamd_lua_traceback); gint err_idx = lua_gettop (L); |