fileio uses ZSTD_resetDStream()
diff --git a/programs/fileio.c b/programs/fileio.c
index 0569582..598848d 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -480,8 +480,6 @@
size_t srcBufferSize;
void* dstBuffer;
size_t dstBufferSize;
- void* dictBuffer;
- size_t dictBufferSize;
ZSTD_DStream* dctx;
FILE* dstFile;
} dRess_t;
@@ -501,7 +499,12 @@
if (!ress.srcBuffer || !ress.dstBuffer) EXM_THROW(61, "Allocation error : not enough memory");
/* dictionary */
- ress.dictBufferSize = FIO_loadFile(&(ress.dictBuffer), dictFileName);
+ { void* dictBuffer;
+ size_t const dictBufferSize = FIO_loadFile(&dictBuffer, dictFileName);
+ size_t const initError = ZSTD_initDStream_usingDict(ress.dctx, dictBuffer, dictBufferSize);
+ if (ZSTD_isError(initError)) EXM_THROW(61, "ZSTD_initDStream_usingDict error : %s", ZSTD_getErrorName(initError));
+ free(dictBuffer);
+ }
return ress;
}
@@ -512,7 +515,6 @@
if (ZSTD_isError(errorCode)) EXM_THROW(69, "Error : can't free ZSTD_DStream context resource : %s", ZSTD_getErrorName(errorCode));
free(ress.srcBuffer);
free(ress.dstBuffer);
- free(ress.dictBuffer);
}
@@ -601,7 +603,7 @@
size_t readSize;
U32 storedSkips = 0;
- ZSTD_initDStream_usingDict(ress.dctx, ress.dictBuffer, ress.dictBufferSize);
+ ZSTD_resetDStream(ress.dctx);
/* Header loading (optional, saves one loop) */
{ size_t const toLoad = 9 - alreadyLoaded; /* assumption : 9 >= alreadyLoaded */
diff --git a/tests/playTests.sh b/tests/playTests.sh
index 21e98bf..042197c 100755
--- a/tests/playTests.sh
+++ b/tests/playTests.sh
@@ -205,7 +205,7 @@
$ZSTD -f --rm dirTestDict/* -D tmpDictC
$ZSTD -d --rm dirTestDict/*.zst -D tmpDictC # note : use internal checksum by default
if [[ "$OSTYPE" == "darwin"* ]]; then
- $ECHO "test skipped on OS-X" # not compatible with OS-X's md5
+ $ECHO "md5sum -c not supported on OS-X : test skipped" # not compatible with OS-X's md5
else
$MD5SUM -c tmph1
fi
diff --git a/tests/zstreamtest.c b/tests/zstreamtest.c
index 97fbaa1..d10d4f1 100644
--- a/tests/zstreamtest.c
+++ b/tests/zstreamtest.c
@@ -209,7 +209,8 @@
/* Byte-by-byte decompression test */
DISPLAYLEVEL(4, "test%3i : decompress byte-by-byte : ", testNb++);
- { size_t r = 1;
+ { /* skippable frame */
+ size_t r = 1;
ZSTD_initDStream_usingDict(zd, CNBuffer, 128 KB);
inBuff.src = compressedBuffer;
outBuff.dst = decodedBuffer;
@@ -221,9 +222,10 @@
r = ZSTD_decompressStream(zd, &outBuff, &inBuff);
if (ZSTD_isError(r)) goto _output_error;
}
+ /* normal frame */
ZSTD_initDStream_usingDict(zd, CNBuffer, 128 KB);
r=1;
- while (r) { /* normal frame */
+ while (r) {
inBuff.size = inBuff.pos + 1;
outBuff.size = outBuff.pos + 1;
r = ZSTD_decompressStream(zd, &outBuff, &inBuff);
@@ -322,6 +324,8 @@
}
+/* ====== Fuzzer tests ====== */
+
static size_t findDiff(const void* buf1, const void* buf2, size_t max)
{
const BYTE* b1 = (const BYTE*)buf1;
@@ -413,8 +417,8 @@
FUZ_rand(&coreSeed);
lseed = coreSeed ^ prime1;
- /* states full reset (unsynchronized) */
- /* some issues only happen when reusing states in a specific sequence of parameters */
+ /* states full reset (deliberately not synchronized) */
+ /* some issues can only happen when reusing states */
if ((FUZ_rand(&lseed) & 0xFF) == 131) { ZSTD_freeCStream(zc); zc = ZSTD_createCStream(); }
if ((FUZ_rand(&lseed) & 0xFF) == 132) { ZSTD_freeDStream(zd); zd = ZSTD_createDStream(); }