mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-08 08:07:10 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: regex: fix pcre_study error handling

Browse Source 
pcre_study() may return NULL even though it succeeded. In this case error is
NULL otherwise error is not NULL. Also see man 3 pcre_study.

Previously a ACL pattern of e.g. ".*" would cause error because pcre_study did
not found anything to speed up matching and returned regex->extra = NULL and
error = NULL which in this case was a false-positive. That happend only when
PCRE_JIT was enabled for HAProxy but libpcre has been built without JIT.

Signed-off-by: Christian Ruppert <c.ruppert@babiel.com>

[wt: this needs to be backported to 1.5 as well]
This commit is contained in:
Christian Ruppert 2014-10-29 17:05:53 +01:00 committed by Willy Tarreau
parent a616ba6f5f
commit 955f4613cb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/regex.c
View File

@ -290,7 +290,7 @@ int regex_comp(const char *str, struct my_regex *regex, int cs, int cap, char **
#ifdef USE_PCRE_JIT #ifdef USE_PCRE_JIT
regex->extra = pcre_study(regex->reg, PCRE_STUDY_JIT_COMPILE, &error); regex->extra = pcre_study(regex->reg, PCRE_STUDY_JIT_COMPILE, &error);
if (!regex->extra) { if (!regex->extra && error != NULL) {
pcre_free(regex->reg); pcre_free(regex->reg);
memprintf(err, "failed to compile regex '%s' (error=%s)", str, error); memprintf(err, "failed to compile regex '%s' (error=%s)", str, error);
return 0; return 0;