Fix broken uploadProgressCallback closure

Since the callback is global we can't refer to 'path' in it. This could cause a segfault or printing of arbitrary data.
NixOS · Oct 30, 2018 · 0163e89 · 0163e89
1 parent 056c3fb
commit 0163e89
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
@@ -269,14 +269,14 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
             transferConfig.bufferSize = bufferSize;
 
             transferConfig.uploadProgressCallback =
-                [&](const TransferManager *transferManager,
-                    const std::shared_ptr<const TransferHandle>
-                    &transferHandle)
+                [](const TransferManager *transferManager,
+                   const std::shared_ptr<const TransferHandle>
+                   &transferHandle)
                 {
                     //FIXME: find a way to properly abort the multipart upload.
                     //checkInterrupt();
                     debug("upload progress ('%s'): '%d' of '%d' bytes",
-                        path,
+                        transferHandle->GetKey(),
                         transferHandle->GetBytesTransferred(),
                         transferHandle->GetBytesTotalSize());
                 };