Commit050098b

committed

Fix use-after-free introduced in55ed3de

Evidenced by failure under RELCACHE_FORCE_RELEASE (buildfarm memberprion).Author: Amit LangoteDiscussion:https://postgr.es/m/CA+HiwqGV=k_Eh4jBiQw66ivvdG+EUkrEYeHTYL1SvDj_YOYV0g@mail.gmail.com

1 parentf2f0082 commit050098bCopy full SHA for 050098b

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1059,13 +1059,11 @@ DefineIndex(Oid relationId,`
`1059`	`1059`
`1060`	`1060`	`memcpy(part_oids,partdesc->oids,sizeof(Oid)*nparts);`
`1061`	`1061`
`1062`		`-parentDesc=CreateTupleDescCopy(RelationGetDescr(rel));`
	`1062`	`+parentDesc=RelationGetDescr(rel);`
`1063`	`1063`	`opfamOids=palloc(sizeof(Oid)*numberOfKeyAttributes);`
`1064`	`1064`	`for (i=0;i<numberOfKeyAttributes;i++)`
`1065`	`1065`	`opfamOids[i]=get_opclass_family(classObjectId[i]);`
`1066`	`1066`
`1067`		`-table_close(rel,NoLock);`
`1068`		`-`
`1069`	`1067`	`/*`
`1070`	`1068`	`* For each partition, scan all existing indexes; if one matches`
`1071`	`1069`	`* our index definition and is not already attached to some other`
`@@ -1265,13 +1263,12 @@ DefineIndex(Oid relationId,`
`1265`	`1263`	`heap_freetuple(newtup);`
`1266`	`1264`	`}`
`1267`	`1265`	`}`
`1268`		`-else`
`1269`		`-table_close(rel,NoLock);`
`1270`	`1266`
`1271`	`1267`	`/*`
`1272`	`1268`	`* Indexes on partitioned tables are not themselves built, so we're`
`1273`	`1269`	`* done here.`
`1274`	`1270`	`*/`
	`1271`	`+table_close(rel,NoLock);`
`1275`	`1272`	`if (!OidIsValid(parentIndexId))`
`1276`	`1273`	`pgstat_progress_end_command();`
`1277`	`1274`	`returnaddress;`

Comments

(0)