Fix use-after-release issue with pg_identify_object_as_address()

michaelpq · michaelpq · commit f93f0b5b2506 · 2021-04-28T11:58:08.000+09:00
Spotted by buildfarm member prion, with -DRELCACHE_FORCE_RELEASE. Introduced in f7aab36. Discussion: https://postgr.es/m/2759018.1619577848@sss.pgh.pa.us Backpatch-through: 9.6
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
@@ -5619,7 +5619,7 @@ getObjectIdentityParts(const ObjectAddress *object,
 					break;
 				}
 				trigForm = (Form_pg_event_trigger) GETSTRUCT(tup);
-				evtname = NameStr(trigForm->evtname);
+				evtname = pstrdup(NameStr(trigForm->evtname));
 				appendStringInfoString(&buffer, quote_identifier(evtname));
 				if (objname)
 					*objname = list_make1(evtname);

Original file line number	Diff line number	Diff line change
`@@ -5619,7 +5619,7 @@ getObjectIdentityParts(const ObjectAddress *object,`
`5619`	`5619`	`break;`
`5620`	`5620`	`}`
`5621`	`5621`	`trigForm = (Form_pg_event_trigger) GETSTRUCT(tup);`
`5622`		`- evtname = NameStr(trigForm->evtname);`
	`5622`	`+ evtname = pstrdup(NameStr(trigForm->evtname));`
`5623`	`5623`	`appendStringInfoString(&buffer, quote_identifier(evtname));`
`5624`	`5624`	`if (objname)`
`5625`	`5625`	`*objname = list_make1(evtname);`