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 | 4b85f20f948d885875a1e1b89979e627b86e6e64 (patch) | |
| tree | 218eca7bdfa2a0588848528ddb468438fef7f581 /src/backend/utils/adt/arrayfuncs.c | |
| parent | 05dc5f4767e1c5ed157b2870f05d57f3378302f4 (diff) | |
| download | postgresql-4b85f20f948d885875a1e1b89979e627b86e6e64.tar.gz postgresql-4b85f20f948d885875a1e1b89979e627b86e6e64.zip | |
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 f572d326b4a..286d010cd63 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -4160,7 +4160,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); |