sharpetronics/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-12-10 00:06:51 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3345 from daniellerozenblit/fix-1GiB-file-bug

Browse Source 
Fix Window Resizing Edge Case
This commit is contained in:
daniellerozenblit 2022-12-13 17:56:38 -05:00 committed by GitHub
commit b0bcbbfe16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/compress/zstd_compress.c
View File

@ -1370,8 +1370,8 @@ ZSTD_adjustCParams_internal(ZSTD_compressionParameters cPar,
} }
/* resize windowLog if input is small enough, to use less memory */ /* resize windowLog if input is small enough, to use less memory */
if ( (srcSize < maxWindowResize) if ( (srcSize <= maxWindowResize)
&& (dictSize < maxWindowResize) ) { && (dictSize <= maxWindowResize) ) {
U32 const tSize = (U32)(srcSize + dictSize); U32 const tSize = (U32)(srcSize + dictSize);
static U32 const hashSizeMin = 1 << ZSTD_HASHLOG_MIN; static U32 const hashSizeMin = 1 << ZSTD_HASHLOG_MIN;
U32 const srcLog = (tSize < hashSizeMin) ? ZSTD_HASHLOG_MIN : U32 const srcLog = (tSize < hashSizeMin) ? ZSTD_HASHLOG_MIN :

9
tests/cli-tests/compression/window-resize.sh Executable file
View File

@ -0,0 +1,9 @@
#!/bin/sh
datagen -g1G > file
zstd --long=31 -1 --single-thread --no-content-size -f file
zstd -l -v file.zst
# We want to ignore stderr (its outputting "*** zstd command line interface
# 64-bits v1.5.3, by Yann Collet ***")
rm file file.zst

0
tests/cli-tests/compression/window-resize.sh.stderr.ignore Normal file
View File

3
tests/cli-tests/compression/window-resize.sh.stdout.glob Normal file
View File

@ -0,0 +1,3 @@
...
Window Size: 1.000 GiB (1073741824 B)
...