diff options
author | Alexander Barkov <bar@mnogosearch.org> | 2013-10-02 11:58:29 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mnogosearch.org> | 2013-10-02 11:58:29 +0400 |
commit | fcf992ba4c0c6b796ba8108c5e1ef99be1d58459 (patch) | |
tree | 75d420c24224d5e9994acfc258a194ac81656c00 /pcre/pcre_compile.c | |
parent | d83648f25ad74f6ea55cff01f124f3920adbb728 (diff) | |
download | mariadb-git-fcf992ba4c0c6b796ba8108c5e1ef99be1d58459.tar.gz |
MDEV-4425 REGEXP enhancements
Adding pcre_stack_guard to avoid crashes in pcre_compile()
on a long recursive patterns with parenthesizes:
SELECT a RLIKE '((((...((((x)))...))))';
Diffstat (limited to 'pcre/pcre_compile.c')
-rw-r--r-- | pcre/pcre_compile.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pcre/pcre_compile.c b/pcre/pcre_compile.c index 1f7bdb40b19..0ebb3f168f1 100644 --- a/pcre/pcre_compile.c +++ b/pcre/pcre_compile.c @@ -7107,6 +7107,12 @@ unsigned int orig_bracount; unsigned int max_bracount; branch_chain bc; +if (pcre_stack_guard && pcre_stack_guard()) +{ + *errorcodeptr= ERR23; + return FALSE; +} + bc.outer = bcptr; bc.current_branch = code; |