Merge pull request #3656 from obsidiansystems/handle-unknown-file-ingestion

Add error message when FileIngestionMethod is out of bounds

1 files changed, 3 insertions, 1 deletions

diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc
index f1afdff69..5cff170dd 100644
--- a/src/libstore/daemon.cc
+++ b/src/libstore/daemon.cc
@@ -358,8 +358,10 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
         std::string s, baseName;
         FileIngestionMethod method;
         {
-            bool fixed, recursive;
+            bool fixed; uint8_t recursive;
             from >> baseName >> fixed /* obsolete */ >> recursive >> s;
+            if (recursive > (uint8_t) FileIngestionMethod::Recursive)
+                throw Error("unsupported FileIngestionMethod with value of %i; you may need to upgrade nix-daemon", recursive);
             method = FileIngestionMethod { recursive };
             /* Compatibility hack. */
             if (!fixed) {