Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit82bbb60

Browse files
committed
Fix valgrind warning for btree_gist indexes on macaddr.
The macaddr opclass stores two macaddr structs (each of size 6) in anindex column that's declared as being of type gbtreekey16, ie 16 bytes.In the original coding this led to passing a palloc'd value of size 12to the index insertion code, so that data would be fetched past theend of the allocated value during index tuple construction. This makesvalgrind unhappy. In principle it could result in a SIGSEGV, thoughwith the current implementation of palloc there's no risk sincethe 12-byte request size would be rounded up to 16 bytes anyway.To fix, add a field to struct gbtree_ninfo showing the declared size ofthe index datums, and use that in the palloc requests; and use palloc0to be sure that any wasted bytes are cleanly initialized.Per report from Andres Freund. No back-patch since there's no currentrisk of a real problem.
1 parentd900e19 commit82bbb60

15 files changed

+22
-4
lines changed

‎contrib/btree_gist/btree_cash.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ static const gbtree_ninfo tinfo =
7878
{
7979
gbt_t_cash,
8080
sizeof(Cash),
81+
16,/* sizeof(gbtreekey16) */
8182
gbt_cashgt,
8283
gbt_cashge,
8384
gbt_casheq,

‎contrib/btree_gist/btree_date.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ static const gbtree_ninfo tinfo =
9696
{
9797
gbt_t_date,
9898
sizeof(DateADT),
99+
8,/* sizeof(gbtreekey8) */
99100
gbt_dategt,
100101
gbt_datege,
101102
gbt_dateeq,

‎contrib/btree_gist/btree_float4.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ static const gbtree_ninfo tinfo =
7777
{
7878
gbt_t_float4,
7979
sizeof(float4),
80+
8,/* sizeof(gbtreekey8) */
8081
gbt_float4gt,
8182
gbt_float4ge,
8283
gbt_float4eq,

‎contrib/btree_gist/btree_float8.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ static const gbtree_ninfo tinfo =
8585
{
8686
gbt_t_float8,
8787
sizeof(float8),
88+
16,/* sizeof(gbtreekey16) */
8889
gbt_float8gt,
8990
gbt_float8ge,
9091
gbt_float8eq,

‎contrib/btree_gist/btree_inet.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ static const gbtree_ninfo tinfo =
7474
{
7575
gbt_t_inet,
7676
sizeof(double),
77+
16,/* sizeof(gbtreekey16) */
7778
gbt_inetgt,
7879
gbt_inetge,
7980
gbt_ineteq,

‎contrib/btree_gist/btree_int2.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ static const gbtree_ninfo tinfo =
7777
{
7878
gbt_t_int2,
7979
sizeof(int16),
80+
4,/* sizeof(gbtreekey4) */
8081
gbt_int2gt,
8182
gbt_int2ge,
8283
gbt_int2eq,

‎contrib/btree_gist/btree_int4.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ static const gbtree_ninfo tinfo =
7878
{
7979
gbt_t_int4,
8080
sizeof(int32),
81+
8,/* sizeof(gbtreekey8) */
8182
gbt_int4gt,
8283
gbt_int4ge,
8384
gbt_int4eq,

‎contrib/btree_gist/btree_int8.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ static const gbtree_ninfo tinfo =
7878
{
7979
gbt_t_int8,
8080
sizeof(int64),
81+
16,/* sizeof(gbtreekey16) */
8182
gbt_int8gt,
8283
gbt_int8ge,
8384
gbt_int8eq,

‎contrib/btree_gist/btree_interval.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,17 @@ gbt_intv_dist(const void *a, const void *b)
8787
/*
8888
* INTERVALSIZE should be the actual size-on-disk of an Interval, as shown
8989
* in pg_type. This might be less than sizeof(Interval) if the compiler
90-
* insists on adding alignment padding at the end of the struct.
90+
* insists on adding alignment padding at the end of the struct. (Note:
91+
* this concern is obsolete with the current definition of Interval, but
92+
* was real before a separate "day" field was added to it.)
9193
*/
9294
#defineINTERVALSIZE 16
9395

9496
staticconstgbtree_ninfotinfo=
9597
{
9698
gbt_t_intv,
9799
sizeof(Interval),
100+
32,/* sizeof(gbtreekey32) */
98101
gbt_intvgt,
99102
gbt_intvge,
100103
gbt_intveq,

‎contrib/btree_gist/btree_macaddr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ static const gbtree_ninfo tinfo =
7474
{
7575
gbt_t_macad,
7676
sizeof(macaddr),
77+
16,/* sizeof(gbtreekey16) */
7778
gbt_macadgt,
7879
gbt_macadge,
7980
gbt_macadeq,

‎contrib/btree_gist/btree_oid.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ static const gbtree_ninfo tinfo =
8484
{
8585
gbt_t_oid,
8686
sizeof(Oid),
87+
8,/* sizeof(gbtreekey8) */
8788
gbt_oidgt,
8889
gbt_oidge,
8990
gbt_oideq,

‎contrib/btree_gist/btree_time.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ static const gbtree_ninfo tinfo =
124124
{
125125
gbt_t_time,
126126
sizeof(TimeADT),
127+
16,/* sizeof(gbtreekey16) */
127128
gbt_timegt,
128129
gbt_timege,
129130
gbt_timeeq,

‎contrib/btree_gist/btree_ts.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ static const gbtree_ninfo tinfo =
127127
{
128128
gbt_t_ts,
129129
sizeof(Timestamp),
130+
16,/* sizeof(gbtreekey16) */
130131
gbt_tsgt,
131132
gbt_tsge,
132133
gbt_tseq,

‎contrib/btree_gist/btree_utils_num.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ gbt_num_compress(GISTENTRY *retval, GISTENTRY *entry, const gbtree_ninfo *tinfo)
2828
Cashch;
2929
}v;
3030

31-
GBT_NUMKEY*r= (GBT_NUMKEY*)palloc0(2*tinfo->size);
31+
GBT_NUMKEY*r= (GBT_NUMKEY*)palloc0(tinfo->indexsize);
3232
void*leaf=NULL;
3333

3434
switch (tinfo->t)
@@ -77,6 +77,8 @@ gbt_num_compress(GISTENTRY *retval, GISTENTRY *entry, const gbtree_ninfo *tinfo)
7777
leaf=DatumGetPointer(entry->key);
7878
}
7979

80+
Assert(tinfo->indexsize >=2*tinfo->size);
81+
8082
memcpy((void*)&r[0],leaf,tinfo->size);
8183
memcpy((void*)&r[tinfo->size],leaf,tinfo->size);
8284
retval=palloc(sizeof(GISTENTRY));
@@ -165,7 +167,7 @@ gbt_num_bin_union(Datum *u, GBT_NUMKEY *e, const gbtree_ninfo *tinfo)
165167

166168
if (!DatumGetPointer(*u))
167169
{
168-
*u=PointerGetDatum(palloc(2*tinfo->size));
170+
*u=PointerGetDatum(palloc0(tinfo->indexsize));
169171
memcpy((void*)&(((GBT_NUMKEY*)DatumGetPointer(*u))[0]), (void*)rd.lower,tinfo->size);
170172
memcpy((void*)&(((GBT_NUMKEY*)DatumGetPointer(*u))[tinfo->size]), (void*)rd.upper,tinfo->size);
171173
}

‎contrib/btree_gist/btree_utils_num.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ typedef struct
3737
/* Attribs */
3838

3939
enumgbtree_typet;/* data type */
40-
int32size;/* size of type , 0 means variable */
40+
int32size;/* size of type, 0 means variable */
41+
int32indexsize;/* size of datums stored in index */
4142

4243
/* Methods */
4344

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp