diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-02-09 14:40:56 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-02-09 14:40:56 +0000 |
| commit | 25909b3152b97eb64d6bfea8f99e53d529566642 (patch) | |
| tree | ffadcba6c753ab73c5b2e73449ed386037eed19f | |
| parent | ed9c986baaed6c85a39b25eea32acff7cfeb5b23 (diff) | |
| download | rspamd-25909b3152b97eb64d6bfea8f99e53d529566642.tar.gz rspamd-25909b3152b97eb64d6bfea8f99e53d529566642.zip | |
Fix for old pcre
| -rw-r--r-- | src/libutil/regexp.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libutil/regexp.c b/src/libutil/regexp.c index e377d1208..023cc325d 100644 --- a/src/libutil/regexp.c +++ b/src/libutil/regexp.c @@ -115,9 +115,11 @@ rspamd_regexp_dtor (rspamd_regexp_t *re) if (re) { if (re->raw_re && re->raw_re != re->re) { #ifndef WITH_PCRE2 +#ifdef HAVE_PCRE_JIT if (re->raw_extra) { pcre_free_study (re->raw_extra); } +#endif #else if (re->mcontext) { pcre2_match_context_free (re->mcontext); @@ -132,9 +134,11 @@ rspamd_regexp_dtor (rspamd_regexp_t *re) } if (re->re) { #ifndef WITH_PCRE2 +#ifdef HAVE_PCRE_JIT if (re->extra) { pcre_free_study (re->extra); } +#endif #else if (re->raw_mcontext) { pcre2_match_context_free (re->raw_mcontext); @@ -427,7 +431,7 @@ fin: #ifndef WITH_PCRE2 r = pcre_compile (real_pattern, regexp_flags, - &err_str, &err_off, NULL); + (const char **)&err_str, &err_off, NULL); (void)err_code; #else r = pcre2_compile (real_pattern, PCRE2_ZERO_TERMINATED, @@ -466,7 +470,7 @@ fin: else { #ifndef WITH_PCRE2 res->raw_re = pcre_compile (real_pattern, regexp_flags & ~PCRE_FLAG(UTF8), - &err_str, &err_off, NULL); + (const char **)&err_str, &err_off, NULL); (void)err_code; #else res->raw_re = pcre2_compile (real_pattern, PCRE2_ZERO_TERMINATED, |