Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fuzz] Superblock fuzz issues #1891

Merged
merged 15 commits into from
Dec 10, 2019
Merged

[fuzz] Superblock fuzz issues #1891

Changes from 3 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
dba767c
Leaving room for checksum
Nov 16, 2019
2d5d961
Typo in comment
Nov 16, 2019
dade644
Output regular uncompressed block when compressSequences fails
Nov 18, 2019
80586f5
Reversing condition order and forwarding error
Nov 18, 2019
8f0c2d0
Going back to original flow but removing else return
Nov 19, 2019
0451acc
Checking noCompressBlock explicitly for rep code confirmation
Nov 21, 2019
10bce19
Mixed declration fix
Nov 21, 2019
707a12c
Test enough room for checksum in superblock
Nov 23, 2019
826b555
Merge branch 'dev' into oss
Nov 23, 2019
d4e17d0
Negating bool, updating bool on inner branches
Nov 26, 2019
1f681d8
Merge branch 'oss' of https://github.com/bimbashrestha/zstd into oss
Nov 27, 2019
1fc9352
Using bss var instead of creating new bool
Dec 3, 2019
ffb0463
Refactor
Dec 4, 2019
2ec556f
Moving init/end functions, moving compressSuperBlock inside body()
Dec 4, 2019
e1913dc
Making const, removing unnecessary indent, changing parameter order
Dec 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions lib/compress/zstd_compress.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2480,8 +2480,11 @@ static size_t ZSTD_compressBlock_targetCBlockSize(ZSTD_CCtx* zc,
* enough for SuperBlock compression.
* In such case, fall back to normal compression. This is possible because
* targetCBlockSize is best effort not a guarantee. */
if (cSize != ERROR(dstSize_tooSmall)) return cSize;
else {
if (cSize == ERROR(dstSize_tooSmall) || (dstCapacity - cSize) < 4) {
/* We check (dstCapacity - cSize) < 4 above because we have to make sure
* to leave enough room for the checksum that will eventually get added in
* the epilogue. Otherwise, we're just going to throw the dstSize_tooSmall
* error there instead of here */
BYTE* const ostart = (BYTE*)dst;
/* If ZSTD_noCompressSuperBlock fails with dstSize_tooSmall,
* compress normally.
Expand All @@ -2493,12 +2496,18 @@ static size_t ZSTD_compressBlock_targetCBlockSize(ZSTD_CCtx* zc,
srcSize,
zc->entropyWorkspace, HUF_WORKSPACE_SIZE /* statically allocated in resetCCtx */,
zc->bmi2);
if (!ZSTD_isError(cSize) && cSize != 0) {

bimbashrestha marked this conversation as resolved.
Show resolved Hide resolved
if (cSize == 0) {
/* If compressSequences didn't work, we just output a regular
* uncompressed block */
cSize = ZSTD_noCompressBlock(dst, dstCapacity, src, srcSize, lastBlock);
FORWARD_IF_ERROR(cSize);
} else {
U32 const cBlockHeader24 = lastBlock + (((U32)bt_compressed)<<1) + (U32)(cSize << 3);
MEM_writeLE24(ostart, cBlockHeader24);
cSize += ZSTD_blockHeaderSize;
bimbashrestha marked this conversation as resolved.
Show resolved Hide resolved
}
}
} else return cSize;
bimbashrestha marked this conversation as resolved.
Show resolved Hide resolved
}

if (!ZSTD_isError(cSize) && cSize != 0) {
bimbashrestha marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -2853,7 +2862,7 @@ static size_t ZSTD_checkDictNCount(short* normalizedCounter, unsigned dictMaxSym

size_t ZSTD_loadCEntropy(ZSTD_compressedBlockState_t* bs, void* workspace,
short* offcodeNCount, unsigned* offcodeMaxValue,
const void* const dict, size_t dictSize)
const void* const dict, size_t dictSize)
{
const BYTE* dictPtr = (const BYTE*)dict; /* skip magic num and dict ID */
const BYTE* const dictEnd = dictPtr + dictSize;
Expand Down