facebook/zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added protection : MT incompatible with Static allocation

Browse Source
This commit is contained in:
Yann Collet 2017-06-15 18:03:34 -07:00
parent bb0aaf9579
commit 05ae4b2190
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/compress/zstd_compress.c
View File

@ -339,6 +339,8 @@ size_t ZSTD_CCtx_setParameter(ZSTD_CCtx* cctx, ZSTD_cParameter param, unsigned v
if (value > 1) return ERROR(compressionParameter_unsupported); if (value > 1) return ERROR(compressionParameter_unsupported);
#endif #endif
if ((value>1) && (cctx->nbThreads != value)) { if ((value>1) && (cctx->nbThreads != value)) {
if (cctx->staticSize) /* MT not compatible with static alloc */
return ERROR(compressionParameter_unsupported);
ZSTDMT_freeCCtx(cctx->mtctx); ZSTDMT_freeCCtx(cctx->mtctx);
cctx->nbThreads = value; cctx->nbThreads = value;
cctx->mtctx = ZSTDMT_createCCtx(value); cctx->mtctx = ZSTDMT_createCCtx(value);

3
lib/zstd.h
View File

@ -68,7 +68,7 @@ ZSTDLIB_API unsigned ZSTD_versionNumber(void); /**< to be used when checking d
#define ZSTD_QUOTE(str) #str #define ZSTD_QUOTE(str) #str
#define ZSTD_EXPAND_AND_QUOTE(str) ZSTD_QUOTE(str) #define ZSTD_EXPAND_AND_QUOTE(str) ZSTD_QUOTE(str)
#define ZSTD_VERSION_STRING ZSTD_EXPAND_AND_QUOTE(ZSTD_LIB_VERSION) #define ZSTD_VERSION_STRING ZSTD_EXPAND_AND_QUOTE(ZSTD_LIB_VERSION)
ZSTDLIB_API const char* ZSTD_versionString(void); ZSTDLIB_API const char* ZSTD_versionString(void); /* v1.3.0 */
/*************************************** /***************************************
@ -424,6 +424,7 @@ typedef struct { ZSTD_allocFunction customAlloc; ZSTD_freeFunction customFree; v
/* use this constant to defer to stdlib's functions */ /* use this constant to defer to stdlib's functions */
static const ZSTD_customMem ZSTD_defaultCMem = { NULL, NULL, NULL}; static const ZSTD_customMem ZSTD_defaultCMem = { NULL, NULL, NULL};
/*************************************** /***************************************
* Frame size functions * Frame size functions
***************************************/ ***************************************/