sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-06 00:04:03 -04:00
Code Issues Projects Releases Wiki Activity

Avoid faulty alignment of Datums in build_sorted_items().

Browse Source 
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
This commit is contained in:
Tom Lane 2025-09-10 17:51:24 -04:00
parent bdc6cfcd12
commit 09036dc71c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/statistics/extended_stats.c
View File

@ -986,10 +986,9 @@ build_sorted_items(StatsBuildData *data, int *nitems,
{
int i,
j,
len,
nrows;
int nvalues = data->numrows * numattrs;
Size len;
SortItem *items;
Datum *values;
bool *isnull;
@ -997,14 +996,16 @@ build_sorted_items(StatsBuildData *data, int *nitems,
int *typlen;
/* 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. */
ptr = palloc0(len);
/* items to sort */
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 = (Datum *) ptr;