From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Sun, 24 Nov 2024 07:36:32 +0000 (+0100)
Subject: Solaris and Illumos: fix build due to use of memset in zstd code.
X-Git-Tag: VALGRIND_3_25_0~220
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fda9e5dbe01cfbf596f3809d321323405b9a57f;p=thirdparty%2Fvalgrind.git

Solaris and Illumos: fix build due to use of memset in zstd code.
---

diff --git a/coregrind/m_debuginfo/zstddeclib.c b/coregrind/m_debuginfo/zstddeclib.c
index 086f1e440..5b1f3c2fb 100644
--- a/coregrind/m_debuginfo/zstddeclib.c
+++ b/coregrind/m_debuginfo/zstddeclib.c
@@ -10417,7 +10417,7 @@ XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* dstState, const XXH32_state_t
 XXH_PUBLIC_API XXH_errorcode XXH32_reset(XXH32_state_t* statePtr, XXH32_hash_t seed)
 {
     XXH_ASSERT(statePtr != NULL);
-    memset(statePtr, 0, sizeof(*statePtr));
+    VG_(memset)(statePtr, 0, sizeof(*statePtr));
     statePtr->v[0] = seed + XXH_PRIME32_1 + XXH_PRIME32_2;
     statePtr->v[1] = seed + XXH_PRIME32_2;
     statePtr->v[2] = seed + 0;
@@ -10863,7 +10863,7 @@ XXH_PUBLIC_API void XXH64_copyState(XXH_NOESCAPE XXH64_state_t* dstState, const
 XXH_PUBLIC_API XXH_errorcode XXH64_reset(XXH_NOESCAPE XXH64_state_t* statePtr, XXH64_hash_t seed)
 {
     XXH_ASSERT(statePtr != NULL);
-    memset(statePtr, 0, sizeof(*statePtr));
+    VG_(memset)(statePtr, 0, sizeof(*statePtr));
     statePtr->v[0] = seed + XXH_PRIME64_1 + XXH_PRIME64_2;
     statePtr->v[1] = seed + XXH_PRIME64_2;
     statePtr->v[2] = seed + 0;
@@ -13456,7 +13456,7 @@ XXH3_reset_internal(XXH3_state_t* statePtr,
     XXH_ASSERT(offsetof(XXH3_state_t, nbStripesPerBlock) > initStart);
     XXH_ASSERT(statePtr != NULL);
     /* set members from bufferedSize to nbStripesPerBlock (excluded) to 0 */
-    memset((char*)statePtr + initStart, 0, initLength);
+    VG_(memset)((char*)statePtr + initStart, 0, initLength);
     statePtr->acc[0] = XXH_PRIME32_3;
     statePtr->acc[1] = XXH_PRIME64_1;
     statePtr->acc[2] = XXH_PRIME64_2;