Fix a second cause of undersized pallocs for btree_gist indexes on macaddr.

tglsfdc · tglsfdc · commit 39586bc1e971 · 2014-05-16T15:18:09.000-04:00
gbt_macad_union also allocated 12-byte structs where we really need 16.

Per report from Andres Freund.  No back-patch since there's no current
risk of a real problem.
diff --git a/contrib/btree_gist/btree_macaddr.c b/contrib/btree_gist/btree_macaddr.c
@@ -12,6 +12,7 @@ typedef struct
 {
 	macaddr		lower;
 	macaddr		upper;
+	char		pad[4];			/* make struct size = sizeof(gbtreekey16) */
 } macKEY;
 
 /*
@@ -143,7 +144,7 @@ Datum
 gbt_macad_union(PG_FUNCTION_ARGS)
 {
 	GistEntryVector *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
-	void	   *out = palloc(sizeof(macKEY));
+	void	   *out = palloc0(sizeof(macKEY));
 
 	*(int *) PG_GETARG_POINTER(1) = sizeof(macKEY);
 	PG_RETURN_POINTER(gbt_num_union((void *) out, entryvec, &tinfo));

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ typedef struct`
`12`	`12`	`{`
`13`	`13`	`macaddr lower;`
`14`	`14`	`macaddr upper;`
	`15`	`+ char pad[4]; /* make struct size = sizeof(gbtreekey16) */`
`15`	`16`	`} macKEY;`
`16`	`17`
`17`	`18`	`/*`
`@@ -143,7 +144,7 @@ Datum`
`143`	`144`	`gbt_macad_union(PG_FUNCTION_ARGS)`
`144`	`145`	`{`
`145`	`146`	`GistEntryVector entryvec = (GistEntryVector ) PG_GETARG_POINTER(0);`
`146`		`- void *out = palloc(sizeof(macKEY));`
	`147`	`+ void *out = palloc0(sizeof(macKEY));`
`147`	`148`
`148`	`149`	`(int ) PG_GETARG_POINTER(1) = sizeof(macKEY);`
`149`	`150`	`PG_RETURN_POINTER(gbt_num_union((void *) out, entryvec, &tinfo));`