denuvo-ref/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd synced 2026-08-22 22:32:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 8e6d1d23d5 into 82d322c497

Browse source
This commit is contained in:
cdpersonal 2026-08-20 15:04:45 -07:00 • committed by GitHub
commit 7949cf6e29
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 63 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/compress/zstd_compress.c
View file

@ -2519,12 +2519,18 @@ static size_t ZSTD_resetCCtx_usingCDict(ZSTD_CCtx* cctx,
(unsigned)pledgedSrcSize);
if (ZSTD_shouldAttachDict(cdict, params, pledgedSrcSize)) {
return ZSTD_resetCCtx_byAttachingCDict(
cctx, cdict, *params, pledgedSrcSize, zbuff);
FORWARD_IF_ERROR(ZSTD_resetCCtx_byAttachingCDict(
cctx, cdict, *params, pledgedSrcSize, zbuff), "");
} else {
return ZSTD_resetCCtx_byCopyingCDict(
cctx, cdict, *params, pledgedSrcSize, zbuff);
FORWARD_IF_ERROR(ZSTD_resetCCtx_byCopyingCDict(
cctx, cdict, *params, pledgedSrcSize, zbuff), "");
}
/* A byRef CDict's window still points into the caller's buffer, which may be
* adjacent to the input : same non-determinism as refPrefix. No-op when attached. */
cctx->blockState.matchState.forceNonContiguous = params->deterministicRefPrefix;
return 0;
}
/*! ZSTD_copyCCtx_internal() :

3
lib/zstd.h
View file

@ -2278,6 +2278,9 @@ ZSTDLIB_STATIC_API size_t ZSTD_CCtx_refPrefix_advanced(ZSTD_CCtx* cctx, const vo
* contiguous, and is free if they weren't contiguous. We don't expect that
* intentionally making the dictionary and data contiguous will be worth the
* cost to memcpy() the data.
*
* This covers ZSTD_CCtx_refPrefix(), ZSTD_CCtx_loadDictionary_byReference(),
* and CDicts created with ZSTD_dlm_byRef.
*/
#define ZSTD_c_deterministicRefPrefix ZSTD_c_experimentalParam15

50
tests/fuzzer.c
View file

@ -1516,6 +1516,56 @@ static int basicUnitTests(U32 const seed, double compressibility)
}
DISPLAYLEVEL(3, "OK \n");
DISPLAYLEVEL(3, "test%3i : testing CDict by reference for determinism : ", testNb++);
{ /* Same contract as the test above, for a CDict referencing the caller's
* buffer. ZSTD_dictForceCopy selects the affected path. */
size_t const testSize = 128 KB;
ZSTD_CCtx* const cctx = ZSTD_createCCtx();
char* const dict = (char*)malloc(2 * testSize);
int level;
if (cctx == NULL || dict == NULL) {
DISPLAY("Not enough memory, aborting\n");
testResult = 1;
goto _end;
}
RDG_genBuffer(dict, testSize, 0.5, 0.5, seed);
RDG_genBuffer(CNBuffer, testSize, 0.6, 0.6, seed);
memcpy(dict + testSize, CNBuffer, testSize);
CHECK_Z(ZSTD_CCtx_setParameter(cctx, ZSTD_c_deterministicRefPrefix, 1));
CHECK_Z(ZSTD_CCtx_setParameter(cctx, ZSTD_c_forceAttachDict, ZSTD_dictForceCopy));
for (level = 1; level <= 5; ++level) {
ZSTD_CDict* const cdict = ZSTD_createCDict_byReference(dict, testSize, level);
size_t cSize0;
XXH64_hash_t compressedChecksum0;
if (cdict == NULL) {
DISPLAY("Not enough memory, aborting\n");
testResult = 1;
goto _end;
}
CHECK_Z(ZSTD_CCtx_refCDict(cctx, cdict));
cSize = ZSTD_compress2(cctx, compressedBuffer, compressedBufferSize, CNBuffer, testSize);
CHECK_Z(cSize);
cSize0 = cSize;
compressedChecksum0 = XXH64(compressedBuffer, cSize, 0);
CHECK_Z(ZSTD_CCtx_refCDict(cctx, cdict));
cSize = ZSTD_compress2(cctx, compressedBuffer, compressedBufferSize, dict + testSize, testSize);
CHECK_Z(cSize);
ZSTD_freeCDict(cdict);
if (cSize != cSize0) goto _output_error;
if (XXH64(compressedBuffer, cSize, 0) != compressedChecksum0) goto _output_error;
}
ZSTD_freeCCtx(cctx);
free(dict);
}
DISPLAYLEVEL(3, "OK \n");
DISPLAYLEVEL(3, "test%3i : LDM + opt parser with small uncompressible block ", testNb++);
{ ZSTD_CCtx* cctx = ZSTD_createCCtx();
ZSTD_DCtx* dctx = ZSTD_createDCtx();