Merge pull request #1748 from terrelln/cover-deadlock

[dictBuilder] Fix deadlock in *COVER error case
2019-08-27 10:17:28 -07:00
parent a8391cc5a8 793c71d6ae
commit e9c0fc12d2
2 changed files with 14 additions and 6 deletions
@@ -919,13 +919,12 @@ void COVER_best_finish(COVER_best_t *best, ZDICT_cover_params_t parameters,
        }
      }
      /* Save the dictionary, parameters, and size */
-      if (!dict) {
-        return;
+      if (dict) {
+        memcpy(best->dict, dict, dictSize);
+        best->dictSize = dictSize;
+        best->parameters = parameters;
+        best->compressedSize = compressedSize;
      }
-      memcpy(best->dict, dict, dictSize);
-      best->dictSize = dictSize;
-      best->parameters = parameters;
-      best->compressedSize = compressedSize;
    }
    if (liveJobs == 0) {
      ZSTD_pthread_cond_broadcast(&best->cond);