d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ZSTDIO: Correctly initialize zstd context with provided 'level'

Browse Source 
Prior to this revision, we allocated sufficient context space for 'level'
but never actually set the compress level parameter, so we would always get
the default '3'.

Reviewed by:	markj, vangyzen
MFC after:	12 hours
Sponsored by:	Dell EMC Isilon
Differential Revision:	https://reviews.freebsd.org/D17144
This commit is contained in:
Conrad Meyer 2018-10-20 21:49:44 +00:00
parent 0a3a36cd94
commit 767bc248de
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/kern/subr_compressor.c
View File

@ -275,8 +275,9 @@ zstdio_init(size_t maxiosize, int level)
ZSTD_CCtx *dump_compressor;
struct zstdio_stream *s;
void *wkspc, *owkspc, *buffer;
size_t wkspc_size, buf_size;
size_t wkspc_size, buf_size, rc;
s = NULL;
wkspc_size = ZSTD_estimateCStreamSize(level);
owkspc = wkspc = malloc(wkspc_size + 8, M_COMPRESS,
M_WAITOK | M_NODUMP);
@ -286,12 +287,23 @@ zstdio_init(size_t maxiosize, int level)
dump_compressor = ZSTD_initStaticCCtx(wkspc, wkspc_size);
if (dump_compressor == NULL) {
free(owkspc, M_COMPRESS);
printf("%s: workspace too small.\n", __func__);
return (NULL);
goto out;
}
(void)ZSTD_CCtx_setParameter(dump_compressor, ZSTD_p_checksumFlag, 1);
rc = ZSTD_CCtx_setParameter(dump_compressor, ZSTD_p_checksumFlag, 1);
if (ZSTD_isError(rc)) {
printf("%s: error setting checksumFlag: %s\n", __func__,
ZSTD_getErrorName(rc));
goto out;
}
rc = ZSTD_CCtx_setParameter(dump_compressor, ZSTD_p_compressionLevel,
level);
if (ZSTD_isError(rc)) {
printf("%s: error setting compressLevel: %s\n", __func__,
ZSTD_getErrorName(rc));
goto out;
}
buf_size = ZSTD_CStreamOutSize() * 2;
buffer = malloc(buf_size, M_COMPRESS, M_WAITOK | M_NODUMP);
@ -306,6 +318,9 @@ zstdio_init(size_t maxiosize, int level)
zstdio_reset(s);
out:
if (s == NULL)
free(owkspc, M_COMPRESS);
return (s);
}