Commite4f2d4f

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 parent9653ca2 commite4f2d4fCopy full SHA for e4f2d4f

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -896,13 +896,11 @@ DefineIndex(Oid relationId,`
`896`	`896`
`897`	`897`	`memcpy(part_oids,partdesc->oids,sizeof(Oid)*nparts);`
`898`	`898`
`899`		`-parentDesc=CreateTupleDescCopy(RelationGetDescr(rel));`
	`899`	`+parentDesc=RelationGetDescr(rel);`
`900`	`900`	`opfamOids=palloc(sizeof(Oid)*numberOfKeyAttributes);`
`901`	`901`	`for (i=0;i<numberOfKeyAttributes;i++)`
`902`	`902`	`opfamOids[i]=get_opclass_family(classObjectId[i]);`
`903`	`903`
`904`		`-heap_close(rel,NoLock);`
`905`		`-`
`906`	`904`	`/*`
`907`	`905`	`* For each partition, scan all existing indexes; if one matches`
`908`	`906`	`* our index definition and is not already attached to some other`
`@@ -1100,13 +1098,12 @@ DefineIndex(Oid relationId,`
`1100`	`1098`	`heap_freetuple(newtup);`
`1101`	`1099`	`}`
`1102`	`1100`	`}`
`1103`		`-else`
`1104`		`-heap_close(rel,NoLock);`
`1105`	`1101`
`1106`	`1102`	`/*`
`1107`	`1103`	`* Indexes on partitioned tables are not themselves built, so we're`
`1108`	`1104`	`* done here.`
`1109`	`1105`	`*/`
	`1106`	`+heap_close(rel,NoLock);`
`1110`	`1107`	`returnaddress;`
`1111`	`1108`	`}`
`1112`	`1109`

Comments

(0)