Fix wrong allocation size in c8f621c.

anarazel · anarazel · commit fb3ea0465c17 · 2016-03-06T16:27:20.000-08:00
In c8f621c I forgot to account for MAXALIGN when allocating a new tuplebuf in ReorderBufferGetTupleBuf(). That happens to currently not cause active problems on a number of platforms because the affected pointer is already aligned, but others, like ppc and hppa, trigger this in the regression test, due to a debug memset clearing memory. Fix that. Backpatch: 9.4, like the previous commit.
diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c
@@ -481,7 +481,8 @@ ReorderBufferGetTupleBuf(ReorderBuffer *rb, Size tuple_len)
 	{
 		tuple = (ReorderBufferTupleBuf *)
 			MemoryContextAlloc(rb->context,
-							   sizeof(ReorderBufferTupleBuf) + alloc_len);
+							   sizeof(ReorderBufferTupleBuf) +
+							   MAXIMUM_ALIGNOF + alloc_len);
 		tuple->alloc_tuple_size = alloc_len;
 		tuple->tuple.t_data = ReorderBufferTupleBufData(tuple);
 	}

Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,8 @@ ReorderBufferGetTupleBuf(ReorderBuffer *rb, Size tuple_len)`
`481`	`481`	`{`
`482`	`482`	`tuple = (ReorderBufferTupleBuf *)`
`483`	`483`	`MemoryContextAlloc(rb->context,`
`484`		`- sizeof(ReorderBufferTupleBuf) + alloc_len);`
	`484`	`+ sizeof(ReorderBufferTupleBuf) +`
	`485`	`+ MAXIMUM_ALIGNOF + alloc_len);`
`485`	`486`	`tuple->alloc_tuple_size = alloc_len;`
`486`	`487`	`tuple->tuple.t_data = ReorderBufferTupleBufData(tuple);`
`487`	`488`	`}`