mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update contrib/trgm_regexp's memory management.

Browse Source 
While no code change was necessary for this code to keep working, we
don't need to use PG_TRY()/PG_FINALLY() with explicit clean-up while
working with regexes anymore.

Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/CA%2BhUKGK3PGKwcKqzoosamn36YW-fsuTdOPPF1i_rtEO%3DnEYKSg%40mail.gmail.com
This commit is contained in:
Thomas Munro 2023-04-08 21:55:28 +12:00
parent 4f51429dd7
commit 6db75edb2e
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/pg_trgm/trgm_regexp.c
View File

@ -549,22 +549,9 @@ createTrgmNFA(text *text_re, Oid collation,
REG_ADVANCED | REG_NOSUB, collation); REG_ADVANCED | REG_NOSUB, collation);
#endif #endif
/*
* Since the regexp library allocates its internal data structures with
* malloc, we need to use a PG_TRY block to ensure that pg_regfree() gets
* done even if there's an error.
*/
PG_TRY();
{
trg = createTrgmNFAInternal(&regex, graph, rcontext); trg = createTrgmNFAInternal(&regex, graph, rcontext);
}
PG_FINALLY();
{
pg_regfree(&regex);
}
PG_END_TRY();
/* Clean up all the cruft we created */ /* Clean up all the cruft we created (including regex) */
MemoryContextSwitchTo(oldcontext); MemoryContextSwitchTo(oldcontext);
MemoryContextDelete(tmpcontext); MemoryContextDelete(tmpcontext);