From 93cc18b0f6fa5fa8144079a4f51904d8b3087e94 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Mon, 16 Dec 2019 09:00:08 +0000 Subject: [PATCH] util: Don't allow DecodeBase64(...) of strings with embedded NUL characters --- src/util/strencodings.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/util/strencodings.cpp b/src/util/strencodings.cpp index 8f2d05f03b..dfd8961cb7 100644 --- a/src/util/strencodings.cpp +++ b/src/util/strencodings.cpp @@ -191,6 +191,12 @@ std::vector DecodeBase64(const char* p, bool* pf_invalid) std::string DecodeBase64(const std::string& str, bool* pf_invalid) { + if (!ValidAsCString(str)) { + if (pf_invalid) { + *pf_invalid = true; + } + return {}; + } std::vector vchRet = DecodeBase64(str.c_str(), pf_invalid); return std::string((const char*)vchRet.data(), vchRet.size()); }