Fix crash in re_cache as headers are not NULL terminated

diff --git a/src/libmime/mime_expressions.c b/src/libmime/mime_expressions.c
index cf9f29fac99121776e8cbd4d29f040cb745a2b76..57275e00468990a852479dc6d9892420d61a1848 100644 (file)
--- a/src/libmime/mime_expressions.c
+++ b/src/libmime/mime_expressions.c
@@ -636,7 +636,7 @@ set:
                                        mime_atom->d.re->type == RSPAMD_RE_RAWHEADER) {
                                rspamd_re_cache_add (cfg->re_cache, mime_atom->d.re->regexp,
                                                mime_atom->d.re->type, mime_atom->d.re->header,
-                                               strlen (mime_atom->d.re->header));
+                                               strlen (mime_atom->d.re->header) + 1);
                        }
                        else {
                                rspamd_re_cache_add (cfg->re_cache, mime_atom->d.re->regexp,

diff --git a/src/lua/lua_config.c b/src/lua/lua_config.c
index 0e61ead07e69b09fdd4e653f7a8dcbd8993f2956..8a8ac9e6fee03d2ad1e0072031e69d7eee625370 100644 (file)
--- a/src/lua/lua_config.c
+++ b/src/lua/lua_config.c
@@ -1609,7 +1609,7 @@ lua_config_register_regexp (lua_State *L)
                                }
 
                                rspamd_re_cache_add (cfg->re_cache, re->re, type,
-                                               (gpointer) header_str, header_len);
+                                               (gpointer) header_str, header_len + 1);
                        }
                }
        }