lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-07-30 22:23:13 +03:00
Code Activity

[pzstd] Fix deadlock in the case of errors

Browse Source 
Fixes #720.
This commit is contained in:
Nick Terrell
2017-06-22 18:09:42 -07:00
parent 0d0fea96bc
commit f570609286
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/pzstd/Pzstd.cpp
View File

@ -585,7 +585,10 @@ std::uint64_t writeFile(
std::uint64_t bytesWritten = 0; std::uint64_t bytesWritten = 0;
std::shared_ptr<BufferWorkQueue> out; std::shared_ptr<BufferWorkQueue> out;
// Grab the output queue for each decompression job (in order). // Grab the output queue for each decompression job (in order).
while (outs.pop(out) && !errorHolder.hasError()) { while (outs.pop(out)) {
if (errorHolder.hasError()) {
continue;
}
if (!decompress) { if (!decompress) {
// If we are compressing and want to write skippable frames we can't // If we are compressing and want to write skippable frames we can't
// start writing before compression is done because we need to know the // start writing before compression is done because we need to know the