util: Don't allow DecodeBase32(...) of strings with embedded NUL characters

practicalswift · practicalswift · commit a6fc26da55de · 2019-12-16T09:04:36.000Z
diff --git a/src/util/strencodings.cpp b/src/util/strencodings.cpp
@@ -266,6 +266,12 @@ std::vector<unsigned char> DecodeBase32(const char* p, bool* pf_invalid)
 
 std::string DecodeBase32(const std::string& str, bool* pf_invalid)
 {
+    if (!ValidAsCString(str)) {
+        if (pf_invalid) {
+            *pf_invalid = true;
+        }
+        return {};
+    }
     std::vector<unsigned char> vchRet = DecodeBase32(str.c_str(), pf_invalid);
     return std::string((const char*)vchRet.data(), vchRet.size());
 }

Original file line number	Diff line number	Diff line change
`@@ -266,6 +266,12 @@ std::vector<unsigned char> DecodeBase32(const char* p, bool* pf_invalid)`
`266`	`266`
`267`	`267`	`std::string DecodeBase32(const std::string& str, bool* pf_invalid)`
`268`	`268`	`{`
	`269`	`+ if (!ValidAsCString(str)) {`
	`270`	`+ if (pf_invalid) {`
	`271`	`+ *pf_invalid = true;`
	`272`	`+ }`
	`273`	`+ return {};`
	`274`	`+ }`
`269`	`275`	`std::vector<unsigned char> vchRet = DecodeBase32(str.c_str(), pf_invalid);`
`270`	`276`	`return std::string((const char*)vchRet.data(), vchRet.size());`
`271`	`277`	`}`