CR fixes

Author: yoniko

lib/compress/zstd_compress.c

@@ -1935,12 +1935,15 @@ ZSTD_reset_matchState(ZSTD_matchState_t* ms,
     if (ZSTD_rowMatchFinderUsed(cParams->strategy, useRowMatchFinder)) {
         /* Row match finder needs an additional table of hashes ("tags") */
         size_t const tagTableSize = hSize * sizeof(U16);
-        ms->tagTable = (U16 *) ZSTD_cwksp_reserve_aligned_init_once(ws, tagTableSize);
         /* We want to generate a new salt in case we reset a Cctx, but we always want to use
          * 0 when we reset a Cdict */
         if(forWho == ZSTD_resetTarget_CCtx) {
+            ms->tagTable = (U16 *) ZSTD_cwksp_reserve_aligned_init_once(ws, tagTableSize);
             ms->hashSalt = ms->hashSalt * 6364136223846793005 + 1; /* based on MUSL rand */
         } else {
+            /* When we are not salting we want to always memset the memory */
+            ms->tagTable = (U16 *) ZSTD_cwksp_reserve_aligned(ws, tagTableSize);
+            ZSTD_memset(ms->tagTable, 0, tagTableSize);
             ms->hashSalt = 0;
         }
         {   /* Switch to 32-entry rows if searchLog is 5 (or more) */

lib/compress/zstd_compress_internal.h

@@ -845,7 +845,7 @@ size_t ZSTD_hashPtrSalted(const void* p, U32 hBits, U32 mls, const U64 hashSalt)
     switch(mls)
     {
         default:
-        case 4: return ZSTD_hash4PtrS(p, hBits, (U32)hashSalt);
+        case 4: return ZSTD_hash4PtrS(p, hBits, (U32)(hashSalt >> 32));
         case 5: return ZSTD_hash5PtrS(p, hBits, hashSalt);
         case 6: return ZSTD_hash6PtrS(p, hBits, hashSalt);
         case 7: return ZSTD_hash7PtrS(p, hBits, hashSalt);