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

Fix use-after-release issue in PL/Sample

Browse Source 
Introduced in adbe62d0.  Per buildfarm member prion, when using
RELCACHE_FORCE_RELEASE.
This commit is contained in:
Michael Paquier 2020-08-18 12:24:22 +09:00
parent adbe62d04b
commit 51300b45db
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/test/modules/plsample/plsample.c
View File

@ -97,6 +97,7 @@ plsample_func_handler(PG_FUNCTION_ARGS)
char *proname; char *proname;
Form_pg_type pg_type_entry; Form_pg_type pg_type_entry;
Oid result_typioparam; Oid result_typioparam;
Oid prorettype;
FmgrInfo result_in_func; FmgrInfo result_in_func;
int numargs; int numargs;
@ -117,7 +118,6 @@ plsample_func_handler(PG_FUNCTION_ARGS)
if (isnull) if (isnull)
elog(ERROR, "could not find source text of function \"%s\"", elog(ERROR, "could not find source text of function \"%s\"",
proname); proname);
ReleaseSysCache(pl_tuple);
source = DatumGetCString(DirectFunctionCall1(textout, ret)); source = DatumGetCString(DirectFunctionCall1(textout, ret));
ereport(NOTICE, ereport(NOTICE,
(errmsg("source text of function \"%s\": %s", (errmsg("source text of function \"%s\": %s",
@ -157,6 +157,10 @@ plsample_func_handler(PG_FUNCTION_ARGS)
i, argnames[i], value))); i, argnames[i], value)));
} }
/* Type of the result */
prorettype = pl_struct->prorettype;
ReleaseSysCache(pl_tuple);
/* /*
* Get the required information for input conversion of the return value. * Get the required information for input conversion of the return value.
* *
@ -165,13 +169,13 @@ plsample_func_handler(PG_FUNCTION_ARGS)
* we can do here. This returns NULL except if the result type is text, * we can do here. This returns NULL except if the result type is text,
* where the result is the source text of the function. * where the result is the source text of the function.
*/ */
if (pl_struct->prorettype != TEXTOID) if (prorettype != TEXTOID)
PG_RETURN_NULL(); PG_RETURN_NULL();
type_tuple = SearchSysCache1(TYPEOID, type_tuple = SearchSysCache1(TYPEOID,
ObjectIdGetDatum(pl_struct->prorettype)); ObjectIdGetDatum(prorettype));
if (!HeapTupleIsValid(type_tuple)) if (!HeapTupleIsValid(type_tuple))
elog(ERROR, "cache lookup failed for type %u", pl_struct->prorettype); elog(ERROR, "cache lookup failed for type %u", prorettype);
pg_type_entry = (Form_pg_type) GETSTRUCT(type_tuple); pg_type_entry = (Form_pg_type) GETSTRUCT(type_tuple);
result_typioparam = getTypeIOParam(type_tuple); result_typioparam = getTypeIOParam(type_tuple);