fix(3p/nix/store): fix race condition in downloader r/1598

In certain circumstances, the decompression thread could race ahead of the downloader thread and process the same chunk twice. Clear the data buffer while the lock is held to prevent this kind of incident.

Change-Id: I19a84a0c5768d1228c6c18a7664a7b8893ef96de
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1658
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>

1 files changed, 2 insertions, 1 deletions

diff --git a/third_party/nix/src/libstore/download.cc b/third_party/nix/src/libstore/download.cc
index e73181e731..fdc14b3762 100644
--- a/third_party/nix/src/libstore/download.cc
+++ b/third_party/nix/src/libstore/download.cc
@@ -835,7 +835,8 @@ void Downloader::download(DownloadRequest&& request, Sink& sink) {
         state.wait(state->avail);
       }
 
-      chunk = state->data;
+      chunk = std::move(state->data);
+      state->data = std::string();
 
       state->request.notify_one();
     }