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:21 -0700 |
| commit | b664b187d7ea6546ef4e0f32167a93c6a74dca08 (patch) | |
| tree | 676358160351aabbebaf9b2fe43a9d7ee4361d67 /src/backend/utils/adt | |
| parent | 4a36c77156f2ff6e07a349cddc65e5dd21abc1a8 (diff) | |
| download | postgresql-b664b187d7ea6546ef4e0f32167a93c6a74dca08.tar.gz postgresql-b664b187d7ea6546ef4e0f32167a93c6a74dca08.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')
| -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 9ba2fb1584b..311d85f7818 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -4082,7 +4082,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); |