Commit705ec05

committed

Fix incorrect KeeperBlock macro in bump.c

The macro was missing a MAXALIGN around the sizeof(BumpContext) whichwould cause problems detecting the keeper block on 32-bit systems thathave a MAXALIGN value of 8.Thank you to Andres Freund, Tomas Vondra and Tom Lane for investigatingand testing.Reported-by: Melanie Plageman, Tomas VondraDiscussion:https://postgr.es/m/CAAKRu_Y6dZjiJEZghgNZp0Gjar1JVq-CH7XGDqExDVHnPgDjuw@mail.gmail.comDiscussion:https://postgr.es/m/a4a10b89-6ba8-4abd-b449-019aafff04fc@enterprisedb.com

1 parentbeabea6 commit705ec05Copy full SHA for 705ec05

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,8 @@`
`57`	`57`	`#defineBump_CHUNK_FRACTION8`
`58`	`58`
`59`	`59`	`/* The keeper block is allocated in the same allocation as the set */`
`60`		`-#defineKeeperBlock(set) ((BumpBlock ) ((char ) (set) + sizeof(BumpContext)))`
	`60`	`+#defineKeeperBlock(set) ((BumpBlock ) ((char ) (set) + \`
	`61`	`+MAXALIGN(sizeof(BumpContext))))`
`61`	`62`	`#defineIsKeeperBlock(set,blk) (KeeperBlock(set) == (blk))`
`62`	`63`
`63`	`64`	`typedefstructBumpBlockBumpBlock;/* forward reference */`
`@@ -198,7 +199,7 @@ BumpContextCreate(MemoryContext parent, const char *name, Size minContextSize,`
`198`	`199`	`dlist_init(&set->blocks);`
`199`	`200`
`200`	`201`	`/* Fill in the initial block's block header */`
`201`		`-block=(BumpBlock) (((char)set)+MAXALIGN(sizeof(BumpContext)));`
	`202`	`+block=KeeperBlock(set);`
`202`	`203`	`/* determine the block size and initialize it */`
`203`	`204`	`firstBlockSize=allocSize-MAXALIGN(sizeof(BumpContext));`
`204`	`205`	`BumpBlockInit(set,block,firstBlockSize);`

Comments

(0)