Merge pull request NixOS#9408 from roblabla/fix-bad-format-string

Fix bad_format_string error when builder stdout contains %
edolstra · Nov 20, 2023 · f450c87 · f450c87
2 parents e29e952 + e2b6821
commit f450c87
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/libutil/serialise.cc b/src/libutil/serialise.cc
@@ -448,7 +448,7 @@ Error readError(Source & source)
     auto msg = readString(source);
     ErrorInfo info {
         .level = level,
-        .msg = hintformat(fmt("%s", msg)),
+        .msg = hintfmt(msg),
     };
     auto havePos = readNum<size_t>(source);
     assert(havePos == 0);
@@ -457,7 +457,7 @@ Error readError(Source & source)
         havePos = readNum<size_t>(source);
         assert(havePos == 0);
         info.traces.push_back(Trace {
-            .hint = hintformat(fmt("%s", readString(source)))
+            .hint = hintfmt(readString(source))
         });
     }
     return Error(std::move(info));