lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-07-29 11:21:22 +03:00
Code Activity

fixed some regressionTests

Browse Source 
but not all
This commit is contained in:
Yann Collet
2024-02-23 18:48:29 -08:00
parent 0591e7eea1
commit 6719794379
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/compress/zstd_compress_superblock.c
View File

@ -467,7 +467,7 @@ static size_t ZSTD_compressSubBlock_multi(const seqStore_t* seqStorePtr,
const BYTE* ofCodePtr = seqStorePtr->ofCode; const BYTE* ofCodePtr = seqStorePtr->ofCode;
size_t const minTarget = 2 KB; /* enforce minimum size to avoid undesirable side effects */ size_t const minTarget = 2 KB; /* enforce minimum size to avoid undesirable side effects */
size_t const targetCBlockSize = MAX(minTarget, cctxParams->targetCBlockSize); size_t const targetCBlockSize = MAX(minTarget, cctxParams->targetCBlockSize);
int writeLitEntropy = entropyMetadata->hufMetadata.hType == set_compressed; int writeLitEntropy = (entropyMetadata->hufMetadata.hType == set_compressed);
int writeSeqEntropy = 1; int writeSeqEntropy = 1;
size_t nbSubBlocks = 1; size_t nbSubBlocks = 1;
@ -523,9 +523,11 @@ static size_t ZSTD_compressSubBlock_multi(const seqStore_t* seqStorePtr,
lastBlock && lastSubBlock); lastBlock && lastSubBlock);
FORWARD_IF_ERROR(cSize, "ZSTD_compressSubBlock failed"); FORWARD_IF_ERROR(cSize, "ZSTD_compressSubBlock failed");
if (cSize == 0 || cSize >= decompressedSize) { if (cSize == 0 || (cSize >= decompressedSize && n>0)) {
litEntropyWritten = 0;
seqEntropyWritten = 0;
cSize = ZSTD_noCompressBlock(op, (size_t)(oend - op), ip, decompressedSize, lastBlock); cSize = ZSTD_noCompressBlock(op, (size_t)(oend - op), ip, decompressedSize, lastBlock);
DEBUGLOG(5, "send an uncompressed sub-block of %u bytes", (unsigned)(decompressedSize)); DEBUGLOG(5, "Generate uncompressed sub-block of %u bytes", (unsigned)(decompressedSize));
FORWARD_IF_ERROR(cSize, "ZSTD_noCompressBlock failed"); FORWARD_IF_ERROR(cSize, "ZSTD_noCompressBlock failed");
assert(cSize != 0); assert(cSize != 0);
/* We have to regenerate the repcodes because we've skipped some sequences */ /* We have to regenerate the repcodes because we've skipped some sequences */
@ -578,8 +580,9 @@ static size_t ZSTD_compressSubBlock_multi(const seqStore_t* seqStorePtr,
size_t ZSTD_compressSuperBlock(ZSTD_CCtx* zc, size_t ZSTD_compressSuperBlock(ZSTD_CCtx* zc,
void* dst, size_t dstCapacity, void* dst, size_t dstCapacity,
void const* src, size_t srcSize, const void* src, size_t srcSize,
unsigned lastBlock) { unsigned lastBlock)
{
ZSTD_entropyCTablesMetadata_t entropyMetadata; ZSTD_entropyCTablesMetadata_t entropyMetadata;
FORWARD_IF_ERROR(ZSTD_buildBlockEntropyStats(&zc->seqStore, FORWARD_IF_ERROR(ZSTD_buildBlockEntropyStats(&zc->seqStore,

12
tests/fuzz/dictionary_round_trip.c
View File

@ -23,13 +23,13 @@
#include "fuzz_data_producer.h" #include "fuzz_data_producer.h"
#include "fuzz_third_party_seq_prod.h" #include "fuzz_third_party_seq_prod.h"
static ZSTD_CCtx *cctx = NULL; static ZSTD_CCtx* cctx = NULL;
static ZSTD_DCtx *dctx = NULL; static ZSTD_DCtx* dctx = NULL;
static size_t roundTripTest(void *result, size_t resultCapacity, static size_t roundTripTest(void* result, size_t resultCapacity,
void *compressed, size_t compressedCapacity, void* compressed, size_t compressedCapacity,
const void *src, size_t srcSize, const void* src, size_t srcSize,
FUZZ_dataProducer_t *producer) FUZZ_dataProducer_t* producer)
{ {
ZSTD_dictContentType_e dictContentType = ZSTD_dct_auto; ZSTD_dictContentType_e dictContentType = ZSTD_dct_auto;
FUZZ_dict_t dict = FUZZ_train(src, srcSize, producer); FUZZ_dict_t dict = FUZZ_train(src, srcSize, producer);