Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2015-09-18 17:55:17 +0000
committerTom Lane2015-09-18 17:55:17 +0000
commitd9c0c728afe734b7087dbb9a4bc16d5b682d139d (patch)
tree4dfb0df17031d0ae480869b4278a22a4352fbc3d /src/backend/regex/regexec.c
parentd63a1720fa0b2ca8452c3a2aa2f6ddbb4f05b640 (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 efd1e9ba022..8505994747f 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)