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/include/utils/arrayaccess.h | |
| parent | 793eb94e31387738c72a8d7d702a6aecc9c5edee (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/20190629210334.GA1244217@rfd.leadboat.com
Diffstat (limited to 'src/include/utils/arrayaccess.h')
| -rw-r--r-- | src/include/utils/arrayaccess.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/include/utils/arrayaccess.h b/src/include/utils/arrayaccess.h index 3ff49f12bc4..ae6d88d2c0d 100644 --- a/src/include/utils/arrayaccess.h +++ b/src/include/utils/arrayaccess.h @@ -71,8 +71,8 @@ array_iter_setup(array_iter *it, AnyArrayType *a) { it->datumptr = NULL; it->isnullptr = NULL; - it->dataptr = ARR_DATA_PTR(&a->flt); - it->bitmapptr = ARR_NULLBITMAP(&a->flt); + it->dataptr = ARR_DATA_PTR((ArrayType *) a); + it->bitmapptr = ARR_NULLBITMAP((ArrayType *) a); } it->bitmask = 1; } |