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/expandeddatum.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/expandeddatum.h')
| -rw-r--r-- | src/include/utils/expandeddatum.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/include/utils/expandeddatum.h b/src/include/utils/expandeddatum.h index 47989a8cf20..fb91c4a4078 100644 --- a/src/include/utils/expandeddatum.h +++ b/src/include/utils/expandeddatum.h @@ -126,7 +126,7 @@ struct ExpandedObjectHeader */ #define EOH_HEADER_MAGIC (-1) #define VARATT_IS_EXPANDED_HEADER(PTR) \ - (((ExpandedObjectHeader *) (PTR))->vl_len_ == EOH_HEADER_MAGIC) + (((varattrib_4b *) (PTR))->va_4byte.va_header == EOH_HEADER_MAGIC) /* * Generic support functions for expanded objects. |