From: Sen Huang <senhuang96@fb.com>
Date: Mon, 21 Oct 2019 22:55:17 +0000 (-0400)
Subject: Fix bad merge
X-Git-Tag: v1.4.4~1^2~15^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ab484a5f90f95a6a1b063b6da27657243d66635;p=thirdparty%2Fzstd.git

Fix bad merge
---

diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index c0ec593f3..d03a2cefc 100644
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -2917,7 +2917,7 @@ static size_t ZSTD_compressBegin_internal(ZSTD_CCtx* cctx,
     }
 
     FORWARD_IF_ERROR( ZSTD_resetCCtx_internal(cctx, *params, pledgedSrcSize,
-                                     ZSTDcrp_continue, zbuff) );
+                                     ZSTDcrp_makeClean, zbuff) );
     {   size_t const dictID = cdict ? 
                 ZSTD_compress_insertDictionary(
                         cctx->blockState.prevCBlock, &cctx->blockState.matchState,
@@ -2925,7 +2925,8 @@ static size_t ZSTD_compressBegin_internal(ZSTD_CCtx* cctx,
                         dictContentType, dtlm, cctx->entropyWorkspace)
               : ZSTD_compress_insertDictionary(
                         cctx->blockState.prevCBlock, &cctx->blockState.matchState,
-                        params, dict, dictSize, dictContentType, dtlm, cctx->entropyWorkspace);
+                        &cctx->workspace, params, dict, dictSize,
+                        dictContentType, dtlm, cctx->entropyWorkspace);
         FORWARD_IF_ERROR(dictID);
         assert(dictID <= UINT_MAX);
         cctx->dictID = (U32)dictID;