diff options
| author | Noah Misch | 2019-07-01 00:34:17 +0000 |
|---|---|---|
| committer | Noah Misch | 2019-07-01 00:34:17 +0000 |
| commit | 459c3cdb4ad8323bfe6bcae0186a3831e0c89c94 (patch) | |
| tree | 56e6c559d025f99e2d7f0c0237f1a9521807d22f /src/backend/utils/adt/arrayfuncs.c | |
| parent | da53be23d1c5e529675e958eaee54cfed4e4dbac (diff) | |
Don't read fields of a misaligned ExpandedObjectHeader or AnyArrayType.
UBSan complains about this. Instead, cast to a suitable type requiring
only 4-byte alignment. DatumGetAnyArrayP() already assumes one can cast
between AnyArrayType and ArrayType, so this doesn't introduce a new
assumption. Back-patch to 9.5, where AnyArrayType was introduced.
Reviewed by Tom Lane.
Discussion: https://postgr.es/m/[email protected]
Diffstat (limited to 'src/backend/utils/adt/arrayfuncs.c')
| -rw-r--r-- | src/backend/utils/adt/arrayfuncs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index 3ae15562465..f9f621e7591 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -4159,7 +4159,7 @@ array_contain_compare(AnyArrayType *array1, AnyArrayType *array2, Oid collation, nelems2 = array2->xpn.nelems; } else - deconstruct_array(&(array2->flt), + deconstruct_array((ArrayType *) array2, element_type, typlen, typbyval, typalign, &values2, &nulls2, &nelems2); |