aboutsummaryrefslogtreecommitdiffstats
path: root/src/libutil/regexp.c
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2016-12-18 15:22:52 +0000
committerVsevolod Stakhov <vsevolod@highsecure.ru>2016-12-18 15:22:52 +0000
commit52773426bf2efd4ee1876690c47ec7114eed19fe (patch)
tree7e49ffbfcde6f834c70547911879664ddf0446fc /src/libutil/regexp.c
parent6906b2bb45ccfcbc5858dea3019d0e05e9e4ff63 (diff)
downloadrspamd-52773426bf2efd4ee1876690c47ec7114eed19fe.tar.gz
rspamd-52773426bf2efd4ee1876690c47ec7114eed19fe.zip
[Minor] Do not blame so loudly if pcre_study fails...
Diffstat (limited to 'src/libutil/regexp.c')
-rw-r--r--src/libutil/regexp.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/libutil/regexp.c b/src/libutil/regexp.c
index e0f7b2340..1d04b83f9 100644
--- a/src/libutil/regexp.c
+++ b/src/libutil/regexp.c
@@ -230,12 +230,16 @@ rspamd_regexp_post_process (rspamd_regexp_t *r)
/* Pcre 1 needs study */
if (r->re) {
r->extra = pcre_study (r->re, study_flags, &err_str);
+
+ if (r->extra == NULL) {
+ msg_debug ("cannot optimize regexp pattern: '%s': %s",
+ r->pattern, err_str);
+ try_jit = FALSE;
+ r->flags |= RSPAMD_REGEXP_FLAG_DISABLE_JIT;
+ }
}
else {
- msg_warn ("cannot optimize regexp pattern: '%s': %s",
- r->pattern, err_str);
- try_jit = FALSE;
- r->flags |= RSPAMD_REGEXP_FLAG_DISABLE_JIT;
+ g_assert_not_reached ();
}
if (r->raw_re && r->raw_re != r->re) {
@@ -247,7 +251,7 @@ rspamd_regexp_post_process (rspamd_regexp_t *r)
if (r->raw_extra == NULL) {
- msg_warn ("cannot optimize raw regexp pattern: '%s': %s",
+ msg_debug ("cannot optimize raw regexp pattern: '%s': %s",
r->pattern, err_str);
try_raw_jit = FALSE;
}
@@ -274,7 +278,7 @@ rspamd_regexp_post_process (rspamd_regexp_t *r)
#endif
}
else {
- msg_warn ("cannot optimize regexp pattern: '%s': %s",
+ msg_debug ("cannot optimize regexp pattern: '%s': %s",
r->pattern, err_str);
r->flags |= RSPAMD_REGEXP_FLAG_DISABLE_JIT;
}