Merge pull request NixOS#8766 from brianmcgee/fix/base64-decode-error…

…-message base64Decode: clearer error message when an invalid character is detected
tweag · Sep 17, 2024 · 95f2b2b · 95f2b2b
2 parents 3fb6605 + dc3ccf0
commit 95f2b2b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
@@ -243,8 +243,9 @@ std::string base64Decode(std::string_view s)
         if (c == '\n') continue;
 
         char digit = base64DecodeChars[(unsigned char) c];
-        if (digit == npos)
-            throw Error("invalid character in Base64 string: '%c'", c);
+        if (digit == npos) {
+            throw Error("invalid character in Base64 string: '%c' in '%s'", c, s.data());
+        }
 
         bits += 6;
         d = d << 6 | digit;