summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdenilson Cavalcanti <cavalcantii@chromium.org>2023-11-16 20:54:38 +0000
committerCopybara-Service <copybara-worker@google.com>2023-11-16 12:59:46 -0800
commit95f3aa6c89deefe19302c1ba4aefea867a03b7ef (patch)
treeb72263c35280218127768e11d943c978af05c034
parent140e29838636a471eb964ecb1dc3521785a28afc (diff)
downloadzlib-95f3aa6c89deefe19302c1ba4aefea867a03b7ef.tar.gz
[zlib] Sync with zlib 1.2.13.1, patch 10 of N
Ported: - Suppress MSAN detections in deflate's slide_hash(). See: https://github.com/madler/zlib/commit/981ee7570ad98a3cf1ae74d737e2ee619ed79171 Bug: 1447443 Change-Id: I5fb761dc73bd52d78b623b29eab94e81bc5518b1 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5034473 Reviewed-by: Hans Wennborg <hans@chromium.org> Commit-Queue: Adenilson Cavalcanti <cavalcantii@chromium.org> Cr-Commit-Position: refs/heads/main@{#1225706} NOKEYCHECK=True GitOrigin-RevId: 5fa3cbd3d219a5260bca25f7fef7747044a84668
-rw-r--r--deflate.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/deflate.c b/deflate.c
index 173ce59..d1611cc 100644
--- a/deflate.c
+++ b/deflate.c
@@ -168,6 +168,11 @@ local const config configuration_table[10] = {
* bit values at the expense of memory usage). We slide even when level == 0 to
* keep the hash table consistent if we switch back to level > 0 later.
*/
+#if defined(__has_feature)
+# if __has_feature(memory_sanitizer)
+ __attribute__((no_sanitize("memory")))
+# endif
+#endif
local void slide_hash(deflate_state *s) {
#if defined(DEFLATE_SLIDE_HASH_SSE2) || defined(DEFLATE_SLIDE_HASH_NEON)
slide_hash_simd(s->head, s->prev, s->w_size, s->hash_size);