From: Yann Collet <cyan@fb.com>
Date: Sat, 1 Feb 2025 08:55:52 +0000 (-0800)
Subject: ensure cdict is properly reset to NULL
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f404893eb9a99d8f9f69ff46edb99383c06dc21b;p=thirdparty%2Fzstd.git

ensure cdict is properly reset to NULL
---

diff --git a/.github/workflows/dev-long-tests.yml b/.github/workflows/dev-long-tests.yml
index 0adfed914..899a57b75 100644
--- a/.github/workflows/dev-long-tests.yml
+++ b/.github/workflows/dev-long-tests.yml
@@ -67,11 +67,11 @@ jobs:
     - name: thread sanitizer zstreamtest
       run: CC=clang ZSTREAM_TESTTIME=-T3mn make tsan-test-zstream
 
-  ubsan-zstreamtest:
+  uasan-zstreamtest:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4.1.1
-    - name: undefined behavior sanitizer zstreamtest
+    - name: ub + address sanitizer on zstreamtest
       run: CC=clang make uasan-test-zstream
 
   # lasts ~15mn
diff --git a/lib/compress/zstdmt_compress.c b/lib/compress/zstdmt_compress.c
index 210ff63fa..1840ad855 100644
--- a/lib/compress/zstdmt_compress.c
+++ b/lib/compress/zstdmt_compress.c
@@ -1323,6 +1323,7 @@ size_t ZSTDMT_initCStream_internal(
     /* update dictionary */
     ZSTD_freeCDict(mtctx->cdictLocal);
     mtctx->cdictLocal = NULL;
+    mtctx->cdict = NULL;
     if (dict) {
         if (dictContentType == ZSTD_dct_rawContent) {
             mtctx->inBuff.prefix.start = (const BYTE*)dict;