diff options
| author | Tom Lane | 2015-09-18 17:55:17 +0000 |
|---|---|---|
| committer | Tom Lane | 2015-09-18 17:55:17 +0000 |
| commit | d9c0c728afe734b7087dbb9a4bc16d5b682d139d (patch) | |
| tree | 4dfb0df17031d0ae480869b4278a22a4352fbc3d /src/include/regex | |
| parent | d63a1720fa0b2ca8452c3a2aa2f6ddbb4f05b640 (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')
| -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 94e06f041b7..fccaf298bf1 100644 --- a/src/include/regex/regguts.h +++ b/src/include/regex/regguts.h @@ -467,7 +467,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 */ |