Merge "Avoid calling memcpy when len == 0 in filetransfer.cc" into main

2 files changed, 12 insertions, 1 deletions

diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc
index 6fe1f9a05..34b92148e 100644
--- a/src/libstore/filetransfer.cc
+++ b/src/libstore/filetransfer.cc
@@ -6,6 +6,7 @@
 #include "signals.hh"
 #include "compression.hh"
 #include "strings.hh"
+#include <cstddef>
 
 #if ENABLE_S3
 #include <aws/core/client/ClientConfiguration.h>
@@ -784,8 +785,10 @@ struct curlFileTransfer : public FileTransfer
 
             size_t read(char * data, size_t len) override
             {
-                auto readPartial = [this](char * data, size_t len) {
+                auto readPartial = [this](char * data, size_t len) -> size_t {
                     const auto available = std::min(len, buffered.size());
+                    if (available == 0u) return 0u;
+
                     memcpy(data, buffered.data(), available);
                     buffered.remove_prefix(available);
                     return available;
diff --git a/tests/unit/libstore/filetransfer.cc b/tests/unit/libstore/filetransfer.cc
index 71e7392fc..fd4d326f0 100644
--- a/tests/unit/libstore/filetransfer.cc
+++ b/tests/unit/libstore/filetransfer.cc
@@ -150,6 +150,14 @@ TEST(FileTransfer, exceptionAbortsDownload)
     }
 }
 
+TEST(FileTransfer, exceptionAbortsRead)
+{
+    auto [port, srv] = serveHTTP("200 ok", "content-length: 0\r\n", [] { return ""; });
+    auto ft = makeFileTransfer();
+    char buf[10] = "";
+    ASSERT_THROW(ft->download(FileTransferRequest(fmt("http://[::1]:%d/index", port)))->read(buf, 10), EndOfFile);
+}
+
 TEST(FileTransfer, NOT_ON_DARWIN(reportsSetupErrors))
 {
     auto [port, srv] = serveHTTP("404 not found", "", [] { return ""; });