mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-07-13 17:59:17 +02:00
82bbb60c30
The macaddr opclass stores two macaddr structs (each of size 6) in an index 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 12 to the index insertion code, so that data would be fetched past the end of the allocated value during index tuple construction. This makes valgrind unhappy. In principle it could result in a SIGSEGV, though with the current implementation of palloc there's no risk since the 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 of the index datums, and use that in the palloc requests; and use palloc0 to be sure that any wasted bytes are cleanly initialized. Per report from Andres Freund. No back-patch since there's no current risk of a real problem.
184 lines
4.0 KiB
C
184 lines
4.0 KiB
C
/*
|
|
* contrib/btree_gist/btree_inet.c
|
|
*/
|
|
#include "postgres.h"
|
|
|
|
#include "btree_gist.h"
|
|
#include "btree_utils_num.h"
|
|
#include "utils/builtins.h"
|
|
#include "utils/inet.h"
|
|
#include "catalog/pg_type.h"
|
|
|
|
typedef struct inetkey
|
|
{
|
|
double lower;
|
|
double upper;
|
|
} inetKEY;
|
|
|
|
/*
|
|
** inet ops
|
|
*/
|
|
PG_FUNCTION_INFO_V1(gbt_inet_compress);
|
|
PG_FUNCTION_INFO_V1(gbt_inet_union);
|
|
PG_FUNCTION_INFO_V1(gbt_inet_picksplit);
|
|
PG_FUNCTION_INFO_V1(gbt_inet_consistent);
|
|
PG_FUNCTION_INFO_V1(gbt_inet_penalty);
|
|
PG_FUNCTION_INFO_V1(gbt_inet_same);
|
|
|
|
|
|
static bool
|
|
gbt_inetgt(const void *a, const void *b)
|
|
{
|
|
return (*((const double *) a) > *((const double *) b));
|
|
}
|
|
static bool
|
|
gbt_inetge(const void *a, const void *b)
|
|
{
|
|
return (*((const double *) a) >= *((const double *) b));
|
|
}
|
|
static bool
|
|
gbt_ineteq(const void *a, const void *b)
|
|
{
|
|
return (*((const double *) a) == *((const double *) b));
|
|
}
|
|
static bool
|
|
gbt_inetle(const void *a, const void *b)
|
|
{
|
|
return (*((const double *) a) <= *((const double *) b));
|
|
}
|
|
static bool
|
|
gbt_inetlt(const void *a, const void *b)
|
|
{
|
|
return (*((const double *) a) < *((const double *) b));
|
|
}
|
|
|
|
static int
|
|
gbt_inetkey_cmp(const void *a, const void *b)
|
|
{
|
|
inetKEY *ia = (inetKEY *) (((const Nsrt *) a)->t);
|
|
inetKEY *ib = (inetKEY *) (((const Nsrt *) b)->t);
|
|
|
|
if (ia->lower == ib->lower)
|
|
{
|
|
if (ia->upper == ib->upper)
|
|
return 0;
|
|
|
|
return (ia->upper > ib->upper) ? 1 : -1;
|
|
}
|
|
|
|
return (ia->lower > ib->lower) ? 1 : -1;
|
|
}
|
|
|
|
|
|
static const gbtree_ninfo tinfo =
|
|
{
|
|
gbt_t_inet,
|
|
sizeof(double),
|
|
16, /* sizeof(gbtreekey16) */
|
|
gbt_inetgt,
|
|
gbt_inetge,
|
|
gbt_ineteq,
|
|
gbt_inetle,
|
|
gbt_inetlt,
|
|
gbt_inetkey_cmp,
|
|
NULL
|
|
};
|
|
|
|
|
|
/**************************************************
|
|
* inet ops
|
|
**************************************************/
|
|
|
|
|
|
Datum
|
|
gbt_inet_compress(PG_FUNCTION_ARGS)
|
|
{
|
|
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
|
|
GISTENTRY *retval;
|
|
|
|
if (entry->leafkey)
|
|
{
|
|
inetKEY *r = (inetKEY *) palloc(sizeof(inetKEY));
|
|
|
|
retval = palloc(sizeof(GISTENTRY));
|
|
r->lower = convert_network_to_scalar(entry->key, INETOID);
|
|
r->upper = r->lower;
|
|
gistentryinit(*retval, PointerGetDatum(r),
|
|
entry->rel, entry->page,
|
|
entry->offset, FALSE);
|
|
}
|
|
else
|
|
retval = entry;
|
|
|
|
PG_RETURN_POINTER(retval);
|
|
}
|
|
|
|
|
|
Datum
|
|
gbt_inet_consistent(PG_FUNCTION_ARGS)
|
|
{
|
|
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
|
|
double query = convert_network_to_scalar(PG_GETARG_DATUM(1), INETOID);
|
|
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
|
|
|
|
/* Oid subtype = PG_GETARG_OID(3); */
|
|
bool *recheck = (bool *) PG_GETARG_POINTER(4);
|
|
inetKEY *kkk = (inetKEY *) DatumGetPointer(entry->key);
|
|
GBT_NUMKEY_R key;
|
|
|
|
/* All cases served by this function are inexact */
|
|
*recheck = true;
|
|
|
|
key.lower = (GBT_NUMKEY *) &kkk->lower;
|
|
key.upper = (GBT_NUMKEY *) &kkk->upper;
|
|
|
|
PG_RETURN_BOOL(gbt_num_consistent(&key, (void *) &query,
|
|
&strategy, GIST_LEAF(entry), &tinfo));
|
|
}
|
|
|
|
|
|
Datum
|
|
gbt_inet_union(PG_FUNCTION_ARGS)
|
|
{
|
|
GistEntryVector *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
|
|
void *out = palloc(sizeof(inetKEY));
|
|
|
|
*(int *) PG_GETARG_POINTER(1) = sizeof(inetKEY);
|
|
PG_RETURN_POINTER(gbt_num_union((void *) out, entryvec, &tinfo));
|
|
}
|
|
|
|
|
|
Datum
|
|
gbt_inet_penalty(PG_FUNCTION_ARGS)
|
|
{
|
|
inetKEY *origentry = (inetKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
|
|
inetKEY *newentry = (inetKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
|
|
float *result = (float *) PG_GETARG_POINTER(2);
|
|
|
|
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
|
|
|
|
PG_RETURN_POINTER(result);
|
|
|
|
}
|
|
|
|
Datum
|
|
gbt_inet_picksplit(PG_FUNCTION_ARGS)
|
|
{
|
|
PG_RETURN_POINTER(gbt_num_picksplit(
|
|
(GistEntryVector *) PG_GETARG_POINTER(0),
|
|
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
|
|
&tinfo
|
|
));
|
|
}
|
|
|
|
Datum
|
|
gbt_inet_same(PG_FUNCTION_ARGS)
|
|
{
|
|
inetKEY *b1 = (inetKEY *) PG_GETARG_POINTER(0);
|
|
inetKEY *b2 = (inetKEY *) PG_GETARG_POINTER(1);
|
|
bool *result = (bool *) PG_GETARG_POINTER(2);
|
|
|
|
*result = gbt_num_same((void *) b1, (void *) b2, &tinfo);
|
|
PG_RETURN_POINTER(result);
|
|
}
|