aboutsummaryrefslogtreecommitdiff
path: root/src/backend/regex/regcomp.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
commitd9c0c728afe734b7087dbb9a4bc16d5b682d139d (patch)
tree4dfb0df17031d0ae480869b4278a22a4352fbc3d /src/backend/regex/regcomp.c
parentd63a1720fa0b2ca8452c3a2aa2f6ddbb4f05b640 (diff)
downloadpostgresql-d9c0c728afe734b7087dbb9a4bc16d5b682d139d.tar.gz
postgresql-d9c0c728afe734b7087dbb9a4bc16d5b682d139d.zip
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/regcomp.c')
-rw-r--r--src/backend/regex/regcomp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c
index 6b95975f2be..d137ac0d3d1 100644
--- a/src/backend/regex/regcomp.c
+++ b/src/backend/regex/regcomp.c
@@ -228,7 +228,7 @@ struct vars
struct subre *tree; /* subexpression tree */
struct subre *treechain; /* all tree nodes allocated */
struct subre *treefree; /* any free tree nodes */
- int ntree; /* number of tree nodes */
+ int ntree; /* number of tree nodes, plus one */
struct cvec *cv; /* interface cvec */
struct cvec *cv2; /* utility cvec */
struct subre *lacons; /* lookahead-constraint vector */