util: Don't allow DecodeBase32(...) of strings with embedded NUL characters
This commit is contained in:
1 parent
93cc18b0f6
commit
a6fc26da55
1 file changed
+6
@@ -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)
|
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);
|
std::vector<unsigned char> vchRet = DecodeBase32(str.c_str(), pf_invalid);
|
||||||
return std::string((const char*)vchRet.data(), vchRet.size());
|
return std::string((const char*)vchRet.data(), vchRet.size());
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user