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 | b8431080851e64f5bf9efebc866fc02f0d57f56f (patch) | |
| tree | a2878800ce086d8a786f570c4b6a125f170284f9 /src/include/regex/regguts.h | |
| parent | 508435f9d33a895bcab194bbcef1ad0232216285 (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/include/regex/regguts.h')
| -rw-r--r-- | src/include/regex/regguts.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/include/regex/regguts.h b/src/include/regex/regguts.h index b173c98e4ea..db3a89d785a 100644 --- a/src/include/regex/regguts.h +++ b/src/include/regex/regguts.h @@ -465,7 +465,7 @@ struct guts size_t nsub; /* copy of re_nsub */ struct subre *tree; struct cnfa search; /* for fast preliminary search */ - int ntree; /* number of subre's, less one */ + int ntree; /* number of subre's, plus one */ struct colormap cmap; int FUNCPTR(compare, (const chr *, const chr *, size_t)); struct subre *lacons; /* lookahead-constraint vector */ |