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

Jump to bottom

detect extraneous bytes in the Sequences section #3674

Merged
merged 1 commit into from Jun 13, 2023
Merged

detect extraneous bytes in the Sequences section #3674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/decompress/zstd_decompress_block.c
View file
Open in desktop
Expand Up @@ -720,6 +720,8 @@ size_t ZSTD_decodeSeqHeaders(ZSTD_DCtx* dctx, int* nbSeqPtr,

if (nbSeq == 0) {
/* No sequence : section ends immediately */
RETURN_ERROR_IF(ip != iend, corruption_detected,
"extraneous data present in the Sequences section");
return (size_t)(ip - istart);
}

Expand Down
11 changes: 11 additions & 0 deletions tests/cli-tests/decompression/detectErrors.sh
View file
Open in desktop
@@ -0,0 +1,11 @@
#!/bin/sh

set -e

GOLDEN_DIR="$ZSTD_REPO_DIR/tests/golden-decompression-errors/"

for file in "$GOLDEN_DIR"/*; do
zstd -t $file && die "should have detected an error"
done
exit 0

5 changes: 5 additions & 0 deletions tests/playTests.sh
View file
Open in desktop
Expand Up @@ -444,6 +444,11 @@ $DIFF -s tmp1 tmp
touch tmp_empty
zstd -d -o tmp2 "$TESTDIR/golden-decompression/empty-block.zst"
$DIFF -s tmp2 tmp_empty

zstd -t "$TESTDIR/golden-decompression/zeroSeq_2B.zst"

zstd -t "$TESTDIR/golden-decompression-errors/zeroSeq_extraneous.zst" && die "invalid Sequences section should have been detected"

rm -f tmp*

println "\n===> compress multiple files"
Expand Down