diff options
| author | Neeraj Bisht <neeraj.x.bisht@oracle.com> | 2013-01-14 16:51:52 +0530 |
|---|---|---|
| committer | Neeraj Bisht <neeraj.x.bisht@oracle.com> | 2013-01-14 16:51:52 +0530 |
| commit | 84d798a1d533fb20cdb90dc0bcfae0891873f1bf (patch) | |
| tree | 59d42a3d31a24a34b677d3383a42f33feb39b9f5 /regex/regcomp.c | |
| parent | fd5380b4964df7e0202bd9b9ac77f6874018e185 (diff) | |
| parent | 99645e5be59145bcab2fe36aefde4224e6e69961 (diff) | |
| download | mariadb-git-84d798a1d533fb20cdb90dc0bcfae0891873f1bf.tar.gz | |
BUG#14303860 - EXECUTING A SELECT QUERY WITH TOO
MANY WILDCARDS CAUSES A SEGFAULT
Back port from 5.6 and trunk
Diffstat (limited to 'regex/regcomp.c')
| -rw-r--r-- | regex/regcomp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/regex/regcomp.c b/regex/regcomp.c index 6e2d2511fc1..abc18174f56 100644 --- a/regex/regcomp.c +++ b/regex/regcomp.c @@ -227,7 +227,7 @@ int stop; /* character this ERE should end at */ while (MORE() && (c = PEEK()) != '|' && c != stop) { if (my_regex_enough_mem_in_stack && - my_regex_enough_mem_in_stack()) + my_regex_enough_mem_in_stack(0)) { SETERROR(REG_ESPACE); return; |