diff options
| author | Heikki Linnakangas | 2018-04-04 11:40:20 +0000 |
|---|---|---|
| committer | Heikki Linnakangas | 2018-04-04 11:40:39 +0000 |
| commit | 3a5e0a91bb324ad2b2b1a0623a3f2e37772b43fc (patch) | |
| tree | 86da646250a146559947f3563ea6aace911d67be /src/port/pg_crc32c_armv8.c | |
| parent | ee9e1455310ec57774ca67158571bec5d3288cdf (diff) | |
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.
Diffstat (limited to 'src/port/pg_crc32c_armv8.c')
| -rw-r--r-- | src/port/pg_crc32c_armv8.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |