From 498eed0a25ee1707677d56e0ea3628584991453b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 23 Jul 2024 10:56:29 +0200
Subject: [PATCH] ~FramedSource(): Don't throw an exception if the remote has
 disconnected

This would cause the daemon to crash with a call to terminate().
---
 src/libutil/serialise.hh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/libutil/serialise.hh b/src/libutil/serialise.hh
index 8254a5f89..8137db5f4 100644
--- a/src/libutil/serialise.hh
+++ b/src/libutil/serialise.hh
@@ -483,13 +483,17 @@ struct FramedSource : Source
 
     ~FramedSource()
     {
-        if (!eof) {
-            while (true) {
-                auto n = readInt(from);
-                if (!n) break;
-                std::vector<char> data(n);
-                from(data.data(), n);
+        try {
+            if (!eof) {
+                while (true) {
+                    auto n = readInt(from);
+                    if (!n) break;
+                    std::vector<char> data(n);
+                    from(data.data(), n);
+                }
             }
+        } catch (...) {
+            ignoreException();
         }
     }