diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2015-09-18 13:55:17 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2015-09-18 13:55:17 -0400 |
| commit | a39331fa573fc2bd6f93322ff190da26ddc477b5 (patch) | |
| tree | 69e65d823bcf5d7767694672d3fc46db78dacd41 /src/backend/regex/regcomp.c | |
| parent | e8e2999470bd8148e8caf2c86a24b7a6fd4085f1 (diff) | |
| download | postgresql-a39331fa573fc2bd6f93322ff190da26ddc477b5.tar.gz postgresql-a39331fa573fc2bd6f93322ff190da26ddc477b5.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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c index 44a472fa69e..5f1e3c5a1a6 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 */ |