From 3a5e0a91bb324ad2b2b1a0623a3f2e37772b43fc Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Wed, 4 Apr 2018 14:40:20 +0300 Subject: [PATCH] Fix the new ARMv8 CRC code for short and unaligned input. The code before the main loop, to handle the possible 1-7 unaligned bytes at the beginning of the input, was broken, and read past the input, if the the input was very short. --- src/port/pg_crc32c_armv8.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/port/pg_crc32c_armv8.c b/src/port/pg_crc32c_armv8.c index 12b8bc1f64..b35b0f758c 100644 --- a/src/port/pg_crc32c_armv8.c +++ b/src/port/pg_crc32c_armv8.c @@ -29,17 +29,17 @@ pg_comp_crc32c_armv8(pg_crc32c crc, const void *data, size_t len) * significantly faster. Process leading bytes so that the loop below * starts with a pointer aligned to eight bytes. */ - if (!PointerIsAligned(p, uint16) && p < pend) + if (!PointerIsAligned(p, uint16) && p + 1 <= pend) { crc = __crc32cb(crc, *p); p += 1; } - if (!PointerIsAligned(p, uint32) && p < pend) + if (!PointerIsAligned(p, uint32) && p + 2 <= pend) { crc = __crc32ch(crc, *(uint16 *) p); p += 2; } - if (!PointerIsAligned(p, uint64) && p < pend) + if (!PointerIsAligned(p, uint64) && p + 4 <= pend) { crc = __crc32cw(crc, *(uint32 *) p); p += 4; -- 2.40.0