diff options
| author | Noah Misch <noah@leadboat.com> | 2019-06-30 17:34:17 -0700 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2019-06-30 17:34:20 -0700 |
| commit | 2938aa2a5b1cebb41f9e54c1ea289c286139c21e (patch) | |
| tree | 339a14300401b3bbdfd38c9024f63631edb07261 /src/backend/utils/adt/arrayfuncs.c | |
| parent | 793eb94e31387738c72a8d7d702a6aecc9c5edee (diff) | |
| download | postgresql-2938aa2a5b1cebb41f9e54c1ea289c286139c21e.tar.gz | |
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/20190629210334.GA1244217@rfd.leadboat.com
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 caac4c3c4f..43ff1d7803 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -4108,7 +4108,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); |