mirrors/zstd
0
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-01-11 04:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix off-by-one error in superblock mode (#3221)

Browse Source 
Fixes #3212.

Long literal and match lengths had an off-by-one error in ZSTD_getSequenceLength.
Fix the off-by-one error, and add a golden compression test that catches the bug.
Also run all the golden tests in the cli-tests framework.
This commit is contained in:
Nick Terrell 2022-08-03 11:28:39 -07:00 committed by GitHub
parent 7e6278a706
commit a70ca2bd7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/common/zstd_internal.h
View File

@ -324,10 +324,10 @@ MEM_STATIC ZSTD_sequenceLength ZSTD_getSequenceLength(seqStore_t const* seqStore
seqLen.matchLength = seq->mlBase + MINMATCH;
if (seqStore->longLengthPos == (U32)(seq - seqStore->sequencesStart)) {
if (seqStore->longLengthType == ZSTD_llt_literalLength) {
seqLen.litLength += 0xFFFF;
seqLen.litLength += 0x10000;
}
if (seqStore->longLengthType == ZSTD_llt_matchLength) {
seqLen.matchLength += 0xFFFF;
seqLen.matchLength += 0x10000;
}
}
return seqLen;

2
lib/decompress/zstd_decompress_block.c
View File

@ -1578,7 +1578,7 @@ ZSTD_decompressSequences_body(ZSTD_DCtx* dctx,
const BYTE* const prefixStart = (const BYTE*)(dctx->prefixStart);
const BYTE* const vBase = (const BYTE*)(dctx->virtualStart);
const BYTE* const dictEnd = (const BYTE*)(dctx->dictEnd);
DEBUGLOG(5, "ZSTD_decompressSequences_body");
DEBUGLOG(5, "ZSTD_decompressSequences_body: nbSeq = %d", nbSeq);
(void)frame;
/* Regen sequences */

12
tests/cli-tests/compression/golden.sh Executable file
View File

@ -0,0 +1,12 @@
#!/bin/sh
set -e
GOLDEN_DIR="$ZSTD_REPO_DIR/tests/golden-compression/"
cp -r "$GOLDEN_DIR" golden/
zstd -rf golden/ --output-dir-mirror golden-compressed/
zstd -r -t golden-compressed/
zstd --target-compressed-block-size=1024 -rf golden/ --output-dir-mirror golden-compressed/
zstd -r -t golden-compressed/

7
tests/cli-tests/decompression/golden.sh Executable file
View File

@ -0,0 +1,7 @@
#!/bin/sh
set -e
GOLDEN_DIR="$ZSTD_REPO_DIR/tests/golden-decompression/"
zstd -r -t "$GOLDEN_DIR"

9
tests/cli-tests/dictionaries/golden.sh Executable file
View File

@ -0,0 +1,9 @@
#!/bin/sh
set -e
GOLDEN_COMP_DIR="$ZSTD_REPO_DIR/tests/golden-compression/"
GOLDEN_DICT_DIR="$ZSTD_REPO_DIR/tests/golden-dictionaries/"
zstd -D "$GOLDEN_DICT_DIR/http-dict-missing-symbols" "$GOLDEN_COMP_DIR/http" -o http.zst
zstd -D "$GOLDEN_DICT_DIR/http-dict-missing-symbols" -t http.zst

1
tests/cli-tests/run.py
View File

@ -699,6 +699,7 @@ if __name__ == "__main__":
if args.exec_prefix is not None:
env["EXEC_PREFIX"] = args.exec_prefix
env["ZSTD_SYMLINK_DIR"] = zstd_symlink_dir
env["ZSTD_REPO_DIR"] = os.path.abspath(REPO_DIR)
env["DATAGEN_BIN"] = os.path.abspath(args.datagen)
env["ZSTDGREP_BIN"] = os.path.abspath(args.zstdgrep)
env["ZSTDLESS_BIN"] = os.path.abspath(args.zstdless)

BIN
tests/golden-compression/large-literal-and-match-lengths Normal file
View File

Binary file not shown.