summaryrefslogtreecommitdiff
path: root/src/backend/regex/regexec.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2015-09-18 13:55:17 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2015-09-18 13:55:17 -0400
commitb8431080851e64f5bf9efebc866fc02f0d57f56f (patch)
treea2878800ce086d8a786f570c4b6a125f170284f9 /src/backend/regex/regexec.c
parent508435f9d33a895bcab194bbcef1ad0232216285 (diff)
Fix low-probability memory leak in regex execution.
After an internal failure in shortest() or longest() while pinning down the exact location of a match, find() forgot to free the DFA structure before returning. This is pretty unlikely to occur, since we just successfully ran the "search" variant of the DFA; but it could happen, and it would result in a session-lifespan memory leak since this code uses malloc() directly. Problem seems to have been aboriginal in Spencer's library, so back-patch all the way. In passing, correct a thinko in a comment I added awhile back about the meaning of the "ntree" field. I happened across these issues while comparing our code to Tcl's version of the library.
Diffstat (limited to 'src/backend/regex/regexec.c')
-rw-r--r--src/backend/regex/regexec.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c
index 5e78f8149c8..b4a3dc3ab40 100644
--- a/src/backend/regex/regexec.c
+++ b/src/backend/regex/regexec.c
@@ -348,7 +348,11 @@ find(struct vars * v,
(chr **) NULL, &hitend);
else
end = longest(v, d, begin, v->stop, &hitend);
- NOERR();
+ if (ISERR())
+ {
+ freedfa(d);
+ return v->err;
+ }
if (hitend && cold == NULL)
cold = begin;
if (end != NULL)