Avoid faulty alignment of Datums in build_sorted_items().

If sizeof(Pointer) is 4 then sizeof(SortItem) will be 12, so that
if data->numrows is odd then we placed the values array at a location
that's not a multiple of 8.  That was fine when sizeof(Datum) was also
4, but in the wake of commit 2a600a93c it makes some alignment-picky
machines unhappy.  (You need a 32-bit machine that nonetheless expects
8-byte alignment of 8-byte quantities, which is an odd-seeming
combination but it does exist outside the Intel universe.)

To fix, MAXALIGN the space allocated to the SortItem array.
In passing, let's make the "len" variable be Size not int,
just for paranoia's sake.

This code was arguably not too safe even before 2a600a93c, but at
present I don't see a strong argument for back-patching.

Reported-by: Tomas Vondra <tomas@vondra.me>
Author: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/87036018-8d70-40ad-a0ac-192b07bd7b04@vondra.me
master
Tom Lane 24 hours ago
parent bdc6cfcd12
commit 09036dc71c
  1. 9
      src/backend/statistics/extended_stats.c

@ -986,10 +986,9 @@ build_sorted_items(StatsBuildData *data, int *nitems,
{ {
int i, int i,
j, j,
len,
nrows; nrows;
int nvalues = data->numrows * numattrs; int nvalues = data->numrows * numattrs;
Size len;
SortItem *items; SortItem *items;
Datum *values; Datum *values;
bool *isnull; bool *isnull;
@ -997,14 +996,16 @@ build_sorted_items(StatsBuildData *data, int *nitems,
int *typlen; int *typlen;
/* Compute the total amount of memory we need (both items and values). */ /* Compute the total amount of memory we need (both items and values). */
len = data->numrows * sizeof(SortItem) + nvalues * (sizeof(Datum) + sizeof(bool)); len = MAXALIGN(data->numrows * sizeof(SortItem)) +
nvalues * (sizeof(Datum) + sizeof(bool));
/* Allocate the memory and split it into the pieces. */ /* Allocate the memory and split it into the pieces. */
ptr = palloc0(len); ptr = palloc0(len);
/* items to sort */ /* items to sort */
items = (SortItem *) ptr; items = (SortItem *) ptr;
ptr += data->numrows * sizeof(SortItem); /* MAXALIGN ensures that the following Datums are suitably aligned */
ptr += MAXALIGN(data->numrows * sizeof(SortItem));
/* values and null flags */ /* values and null flags */
values = (Datum *) ptr; values = (Datum *) ptr;

Loading…
Cancel
Save