ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1748 from terrelln/cover-deadlock

Browse Source 
[dictBuilder] Fix deadlock in *COVER error case
This commit is contained in:
Nick Terrell
2019-08-27 10:17:28 -07:00
committed by GitHub
parent a8391cc5a8 793c71d6ae
commit e9c0fc12d2
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/dictBuilder/cover.c
+2 -3
View File
@@ -919,14 +919,13 @@ void COVER_best_finish(COVER_best_t *best, ZDICT_cover_params_t parameters,
} }
} }
/* Save the dictionary, parameters, and size */ /* Save the dictionary, parameters, and size */
if (!dict) { if (dict) {
return;
}
memcpy(best->dict, dict, dictSize); memcpy(best->dict, dict, dictSize);
best->dictSize = dictSize; best->dictSize = dictSize;
best->parameters = parameters; best->parameters = parameters;
best->compressedSize = compressedSize; best->compressedSize = compressedSize;
} }
}
if (liveJobs == 0) { if (liveJobs == 0) {
ZSTD_pthread_cond_broadcast(&best->cond); ZSTD_pthread_cond_broadcast(&best->cond);
} }
tests/playTests.sh
+9
View File
@@ -526,6 +526,15 @@ $ZSTD -o tmpDict --train "$TESTDIR"/*.c "$PRGDIR"/*.c
test -f tmpDict test -f tmpDict
$ZSTD --train "$TESTDIR"/*.c "$PRGDIR"/*.c $ZSTD --train "$TESTDIR"/*.c "$PRGDIR"/*.c
test -f dictionary test -f dictionary
println "- Test dictionary training fails"
echo "000000000000000000000000000000000" > tmpz
$ZSTD --train tmpz tmpz tmpz tmpz tmpz tmpz tmpz tmpz tmpz && die "Dictionary training should fail : source is all zeros"
if [ -n "$hasMT" ]
then
$ZSTD --train -T0 tmpz tmpz tmpz tmpz tmpz tmpz tmpz tmpz tmpz && die "Dictionary training should fail : source is all zeros"
println "- Create dictionary with multithreading enabled"
$ZSTD --train -T0 "$TESTDIR"/*.c "$PRGDIR"/*.c -o tmpDict
fi
rm tmp* dictionary rm tmp* dictionary