git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d63a172)
Fix low-probability memory leak in regex execution.
author Tom Lane <tgl@sss.pgh.pa.us>
2015年9月18日 17:55:17 +0000 (13:55 -0400)
committer Tom Lane <tgl@sss.pgh.pa.us>
2015年9月18日 17:55:17 +0000 (13:55 -0400)
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.

src/backend/regex/regcomp.c patch | blob | blame | history
src/backend/regex/regexec.c patch | blob | blame | history
src/include/regex/regguts.h patch | blob | blame | history

diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c
index 6b95975f2be2ada43dbb7e079e2fa4dc9fca1aa3..d137ac0d3d16194a17b5358ec9cf3a6ee96e2e45 100644 (file)
--- 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 */
diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c
index efd1e9ba02261621f45d0ab60a5d9495d77a8fd4..8505994747f367fb72342bf1fd9f852f28a9703e 100644 (file)
--- 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)
diff --git a/src/include/regex/regguts.h b/src/include/regex/regguts.h
index 94e06f041b70a373b61b793d1d375c873a306740..fccaf298bf1328caea336caea4ac8ccaab6033f6 100644 (file)
--- 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 */
This is the main PostgreSQL git repository.
RSS Atom

AltStyle によって変換されたページ (->オリジナル) /