diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-05-17 20:10:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-17 20:10:02 +0000 |
| commit | 69bd35a79a69e9454041e6614aaacb3d5e769ec1 (patch) | |
| tree | be1f837374539d06ced5c3f9f2cf0cb231a3b535 | |
| parent | ed8e75b3c203c80d4218837a6c2f9a33ed80aa59 (diff) | |
| parent | 149df9fc10399b6f4983708a42e8a8b318a9abab (diff) | |
| download | zlib-69bd35a79a69e9454041e6614aaacb3d5e769ec1.tar.gz | |
Merge "Upgrade zlib to 14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f" am: 46e555b190 am: 1ff118d107 am: 0e5194fae5 am: 5f87762e26 am: 149df9fc10
Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2592925
Change-Id: Iee91f50f48fe81e5fa86f1a90782c7a8293b643e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | METADATA | 6 | ||||
| -rw-r--r-- | contrib/tests/fuzzers/inflate_with_header_fuzzer.cc | 2 | ||||
| -rw-r--r-- | crc_folding.c | 6 |
3 files changed, 8 insertions, 6 deletions
@@ -9,11 +9,11 @@ third_party { type: GIT value: "https://chromium.googlesource.com/chromium/src/third_party/zlib/" } - version: "b890619bc2b193b8fbe9c1c053f4cd19a9791d92" + version: "14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f" license_type: NOTICE last_upgrade_date { year: 2023 - month: 4 - day: 4 + month: 5 + day: 16 } } diff --git a/contrib/tests/fuzzers/inflate_with_header_fuzzer.cc b/contrib/tests/fuzzers/inflate_with_header_fuzzer.cc index f99220a..dfb5b39 100644 --- a/contrib/tests/fuzzers/inflate_with_header_fuzzer.cc +++ b/contrib/tests/fuzzers/inflate_with_header_fuzzer.cc @@ -12,7 +12,7 @@ #include <fuzzer/FuzzedDataProvider.h> -#include "third_party/zlib/zlib.h" +#include "zlib.h" // Fuzzer builds often have NDEBUG set, so roll our own assert macro. #define ASSERT(cond) \ diff --git a/crc_folding.c b/crc_folding.c index ee31d49..1b4f4e1 100644 --- a/crc_folding.c +++ b/crc_folding.c @@ -435,7 +435,10 @@ unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state *const s) unsigned crc; __m128i x_tmp0, x_tmp1, x_tmp2, crc_fold; - CRC_LOAD(s) + __m128i xmm_crc0 = _mm_loadu_si128((__m128i *)s->crc0 + 0); + __m128i xmm_crc1 = _mm_loadu_si128((__m128i *)s->crc0 + 1); + __m128i xmm_crc2 = _mm_loadu_si128((__m128i *)s->crc0 + 2); + __m128i xmm_crc3 = _mm_loadu_si128((__m128i *)s->crc0 + 3); /* * k1 @@ -491,7 +494,6 @@ unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state *const s) crc = _mm_extract_epi32(xmm_crc3, 2); return ~crc; - CRC_SAVE(s) } #endif /* CRC32_SIMD_SSE42_PCLMUL */ |