Commitee57892

committed

smgr: Make SMgrRelation initialization safer against errors

In case the smgr_open callback failed, the ->pincount field would not beinitialized and the relation would not be put onto the unpinned_relns list.This buglet was introduced in21d9c3e, in 17.Discussion:https://postgr.es/m/3vae7l5ozvqtxmd7rr7zaeq3qkuipz365u3rtim5t5wdkr6f4g@vkgf2fogjirlBackpatch-through: 17

1 parent09ef2f8 commitee57892Copy full SHA for ee57892

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -231,12 +231,12 @@ smgropen(RelFileLocator rlocator, ProcNumber backend)`
`231`	`231`	`reln->smgr_cached_nblocks[i]=InvalidBlockNumber;`
`232`	`232`	`reln->smgr_which=0;/* we only have md.c at present */`
`233`	`233`
`234`		`-/* implementation-specific initialization */`
`235`		`-smgrsw[reln->smgr_which].smgr_open(reln);`
`236`		`-`
`237`	`234`	`/* it is not pinned yet */`
`238`	`235`	`reln->pincount=0;`
`239`	`236`	`dlist_push_tail(&unpinned_relns,&reln->node);`
	`237`	`+`
	`238`	`+/* implementation-specific initialization */`
	`239`	`+smgrsw[reln->smgr_which].smgr_open(reln);`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`returnreln;`

Comments

(0)