diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/regex/regcomp.c | 2 | ||||
| -rw-r--r-- | src/backend/regex/regexec.c | 6 | ||||
| -rw-r--r-- | src/include/regex/regguts.h | 2 |
3 files changed, 7 insertions, 3 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 */ diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c index 5e78f8149c8..b4a3dc3ab40 100644 --- 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 2f3be1aa0ae..dac04033119 100644 --- a/src/include/regex/regguts.h +++ b/src/include/regex/regguts.h @@ -470,7 +470,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 */ |