nixd/librpc: handle EOF

nix-community · Mar 13, 2024 · 65621fe · 65621fe
1 parent b5a9b05
commit 65621fe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/nixd/librpc/include/nixd/rpc/IO.h b/nixd/librpc/include/nixd/rpc/IO.h
@@ -7,6 +7,6 @@
 namespace nixd::rpc {
 
 /// \brief Read N bytes from FD into Buf, block until N bytes are read.
-size_t readBytes(int FD, void *Buf, std::size_t N);
+[[nodiscard]] size_t readBytes(int FD, void *Buf, std::size_t N);
 
 } // namespace nixd::rpc
diff --git a/nixd/librpc/src/Transport.cpp b/nixd/librpc/src/Transport.cpp
@@ -1,6 +1,7 @@
 #include "nixd/rpc/Transport.h"
 #include "nixd/rpc/IO.h"
 
+#include <stdexcept>
 #include <system_error>
 #include <vector>
 
@@ -20,17 +21,24 @@ void send(int OutboundFD, std::string_view Msg) {
 
 std::vector<char> recv(int InboundFD) {
   MessageSizeT Size;
-  readBytes(InboundFD, &Size, sizeof(Size));
+  if (readBytes(InboundFD, &Size, sizeof(MessageSizeT)) <
+      sizeof(MessageSizeT)) {
+    return {};
+  }
 
   // Collect a message
   std::vector<char> Buf(Size);
-  readBytes(InboundFD, Buf.data(), Size);
+  if (readBytes(InboundFD, Buf.data(), Size) < Size) {
+    throw std::runtime_error("in-complete inbound size");
+  }
   return Buf;
 }
 
 int Transport::run() {
   for (;;) {
     std::vector<char> Buf = recv();
+    if (Buf.empty())
+      break;
     handleInbound(Buf);
   }
   return 0;