database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

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

Browse Source 
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.
This commit is contained in:
Tom Lane
2014-05-16 15:18:09 -04:00
parent 82bbb60c30
commit 39586bc1e9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/btree_gist/btree_macaddr.c
View File

@@ -12,6 +12,7 @@ typedef struct
{ {
macaddr lower; macaddr lower;
macaddr upper; macaddr upper;
char pad[4]; /* make struct size = sizeof(gbtreekey16) */
} macKEY; } macKEY;
/* /*
@@ -143,7 +144,7 @@ Datum
gbt_macad_union(PG_FUNCTION_ARGS) gbt_macad_union(PG_FUNCTION_ARGS)
{ {
GistEntryVector *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0); GistEntryVector *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
void *out = palloc(sizeof(macKEY)); void *out = palloc0(sizeof(macKEY));
*(int *) PG_GETARG_POINTER(1) = sizeof(macKEY); *(int *) PG_GETARG_POINTER(1) = sizeof(macKEY);
PG_RETURN_POINTER(gbt_num_union((void *) out, entryvec, &tinfo)); PG_RETURN_POINTER(gbt_num_union((void *) out, entryvec, &tinfo));