diff options
| -rw-r--r-- | src/backend/regex/regcomp.c | 24 | ||||
| -rw-r--r-- | src/backend/utils/adt/regexp.c | 3 |
2 files changed, 16 insertions, 11 deletions
diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c index ceb6f0f8737..5c5a9a8cd2d 100644 --- a/src/backend/regex/regcomp.c +++ b/src/backend/regex/regcomp.c @@ -278,6 +278,9 @@ static struct fns functions = { /* * pg_regcomp - compile regular expression + * + * Note: on failure, no resources remain allocated, so pg_regfree() + * need not be applied to re. */ int pg_regcomp(regex_t *re, @@ -1870,15 +1873,18 @@ rfree(regex_t *re) g = (struct guts *) re->re_guts; re->re_guts = NULL; re->re_fns = NULL; - g->magic = 0; - freecm(&g->cmap); - if (g->tree != NULL) - freesubre((struct vars *) NULL, g->tree); - if (g->lacons != NULL) - freelacons(g->lacons, g->nlacons); - if (!NULLCNFA(g->search)) - freecnfa(&g->search); - FREE(g); + if (g != NULL) + { + g->magic = 0; + freecm(&g->cmap); + if (g->tree != NULL) + freesubre((struct vars *) NULL, g->tree); + if (g->lacons != NULL) + freelacons(g->lacons, g->nlacons); + if (!NULLCNFA(g->search)) + freecnfa(&g->search); + FREE(g); + } } #ifdef REG_DEBUG diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c index 074142e7985..92dfbb11ce6 100644 --- a/src/backend/utils/adt/regexp.c +++ b/src/backend/utils/adt/regexp.c @@ -187,9 +187,8 @@ RE_compile_and_cache(text *text_re, int cflags, Oid collation) if (regcomp_result != REG_OKAY) { - /* re didn't compile */ + /* re didn't compile (no need for pg_regfree, if so) */ pg_regerror(regcomp_result, &re_temp.cre_re, errMsg, sizeof(errMsg)); - /* XXX should we pg_regfree here? */ ereport(ERROR, (errcode(ERRCODE_INVALID_REGULAR_EXPRESSION), errmsg("invalid regular expression: %s", errMsg))); |