summaryrefslogtreecommitdiff
path: root/regex
diff options
context:
space:
mode:
authorShishir Jaiswal <shishir.j.jaiswal@oracle.com>2016-12-04 18:44:51 +0530
committerShishir Jaiswal <shishir.j.jaiswal@oracle.com>2016-12-04 18:44:51 +0530
commit68b88afb0c7b65e36d27ebca05bd2e354840f2cf (patch)
treec24a2b411d487b39fd0a26c2de10a2b71c9ee2ac /regex
parent52b0c8146b1ae84a6c3fa1a20aa41736df485a46 (diff)
downloadmariadb-git-68b88afb0c7b65e36d27ebca05bd2e354840f2cf.tar.gz
Bug#24449090 - BUFFER OVERFLOW IN FUNCTION DUPL
Post-push fix for memory leak in the code inside DBUG_EXECUTE_IF("bug24449090_simulate_oom",...);
Diffstat (limited to 'regex')
-rw-r--r--regex/regcomp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/regex/regcomp.c b/regex/regcomp.c
index 7c450db07b7..13275237d2a 100644
--- a/regex/regcomp.c
+++ b/regex/regcomp.c
@@ -1495,6 +1495,7 @@ register sopno size;
DBUG_EXECUTE_IF("bug24449090_simulate_oom",
{
+ free(p->strip);
p->strip= NULL;
p->ssize= 0;
SETERROR(REG_ESPACE);