Merge bugfix

yoniko · yoniko · commit 8f2280c188cd · 2023-03-13T11:00:59.000-07:00
diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
@@ -1978,7 +1978,7 @@ ZSTD_reset_matchState(ZSTD_matchState_t* ms,
             ZSTD_advanceHashSalt(ms);
         } else {
             /* When we are not salting we want to always memset the memory */
-            ms->tagTable = (U16 *) ZSTD_cwksp_reserve_aligned(ws, tagTableSize);
+            ms->tagTable = ZSTD_cwksp_reserve_aligned(ws, tagTableSize);
             ZSTD_memset(ms->tagTable, 0, tagTableSize);
             ms->hashSalt = 0;
         }

Original file line number	Diff line number	Diff line change
`@@ -1978,7 +1978,7 @@ ZSTD_reset_matchState(ZSTD_matchState_t* ms,`
`1978`	`1978`	`ZSTD_advanceHashSalt(ms);`
`1979`	`1979`	`} else {`
`1980`	`1980`	`/* When we are not salting we want to always memset the memory */`
`1981`		`- ms->tagTable = (U16 *) ZSTD_cwksp_reserve_aligned(ws, tagTableSize);`
	`1981`	`+ ms->tagTable = ZSTD_cwksp_reserve_aligned(ws, tagTableSize);`
`1982`	`1982`	`ZSTD_memset(ms->tagTable, 0, tagTableSize);`
`1983`	`1983`	`ms->hashSalt = 0;`
`1984`	`1984`	`}`