From c332ab330cea11ec81939ac9aee102de663fbad0 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Tue, 17 Nov 2020 11:20:58 +0000 Subject: [PATCH] [Minor] Do not mix HS_FLAG_SINGLEMATCH and HS_FLAG_SOM_LEFTMOST --- src/libserver/re_cache.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libserver/re_cache.c b/src/libserver/re_cache.c index c35da879d..e4b00e541 100644 --- a/src/libserver/re_cache.c +++ b/src/libserver/re_cache.c @@ -1977,13 +1977,14 @@ rspamd_re_cache_compile_timer_cb (EV_P_ ev_timer *w, int revents ) if (pcre_flags & PCRE_FLAG(DOTALL)) { hs_flags[i] |= HS_FLAG_DOTALL; } - if (rspamd_regexp_get_maxhits (re) == 1) { - hs_flags[i] |= HS_FLAG_SINGLEMATCH; - } + if (re_flags & RSPAMD_REGEXP_FLAG_LEFTMOST) { hs_flags[i] |= HS_FLAG_SOM_LEFTMOST; } + else if (rspamd_regexp_get_maxhits (re) == 1) { + hs_flags[i] |= HS_FLAG_SINGLEMATCH; + } gchar *pat = rspamd_re_cache_hs_pattern_from_pcre (re); -- 2.39.5