From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Wed, 4 Apr 2018 11:40:20 +0000 (+0300)
Subject: Fix the new ARMv8 CRC code for short and unaligned input.
X-Git-Tag: REL_11_BETA1~372
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a5e0a91bb324ad2b2b1a0623a3f2e37772b43fc;p=thirdparty%2Fpostgresql.git

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.
---

diff --git a/src/port/pg_crc32c_armv8.c b/src/port/pg_crc32c_armv8.c
index 12b8bc1f64a..b35b0f758c5 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;