Skip to content

Fix 32-bit zstdmt max job size allocation failure #4675

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

Open
danyalahmed1995 wants to merge 1 commit into
base: dev
Choose a base branch
from
+15 −2
Open

Fix 32-bit zstdmt max job size allocation failure #4675

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/compress/zstdmt_compress.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
#ifndef ZSTDMT_JOBSIZE_MIN /* a different value can be selected at compile time */
# define ZSTDMT_JOBSIZE_MIN (512 KB)
#endif
#define ZSTDMT_JOBLOG_MAX (MEM_32bits() ? 29 : 30)
#define ZSTDMT_JOBSIZE_MAX (MEM_32bits() ? (512 MB) : (1024 MB))
#define ZSTDMT_JOBLOG_MAX (MEM_32bits() ? 28 : 30)
#define ZSTDMT_JOBSIZE_MAX (MEM_32bits() ? (256 MB) : (1024 MB))


/* ========================================================
Expand Down
13 changes: 13 additions & 0 deletions tests/fuzzer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3907,6 +3907,19 @@ static int basicUnitTests(U32 const seed, double compressibility)
}
}

DISPLAYLEVEL(3, "test%3i : job size bounds match architecture : ", testNb++);
{ ZSTD_bounds const bounds = ZSTD_cParam_getBounds(ZSTD_c_jobSize);
#ifdef ZSTD_MULTITHREAD
int const expectedJobSizeMax = MEM_32bits() ? (256 MB) : (1024 MB);
#else
int const expectedJobSizeMax = 0;
#endif
CHECK_Z(bounds.error);
if (bounds.lowerBound != 0) goto _output_error;
if (bounds.upperBound != expectedJobSizeMax) goto _output_error;
}
DISPLAYLEVEL(3, "OK \n");

/* advanced parameters for decompression */
{ ZSTD_DCtx* const dctx = ZSTD_createDCtx();
assert(dctx != NULL);
Expand Down