DecodeBase64 returns empty string on *all* errors

It already returns an empty string if it encounters an invalid character.
However, if, instead, it has an incomplete set of characters, it currently
returns a truncated result. Instead, it detects truncation and returns
the empty string.
This commit is contained in:
Sean Curtis 2024-12-16 10:01:03 -08:00
parent 73ef0060aa
commit 53f07b7eee
2 changed files with 16 additions and 3 deletions

View File

@ -74,7 +74,8 @@ std::vector<unsigned char> DecodeBase64(const std::string &input) {
unsigned char *out = &ret[0]; unsigned char *out = &ret[0];
unsigned value = 0; unsigned value = 0;
for (std::size_t i = 0, cnt = 0; i < input.size(); i++) { std::size_t cnt = 0;
for (std::size_t i = 0; i < input.size(); i++) {
if (std::isspace(static_cast<unsigned char>(input[i]))) { if (std::isspace(static_cast<unsigned char>(input[i]))) {
// skip newlines // skip newlines
continue; continue;
@ -84,15 +85,20 @@ std::vector<unsigned char> DecodeBase64(const std::string &input) {
return ret_type(); return ret_type();
value = (value << 6) | d; value = (value << 6) | d;
if (cnt % 4 == 3) { if (cnt == 3) {
*out++ = value >> 16; *out++ = value >> 16;
if (i > 0 && input[i - 1] != '=') if (i > 0 && input[i - 1] != '=')
*out++ = value >> 8; *out++ = value >> 8;
if (input[i] != '=') if (input[i] != '=')
*out++ = value; *out++ = value;
} cnt = 0;
} else {
++cnt; ++cnt;
} }
}
// An invalid number of characters were encountered.
if (cnt != 0)
return ret_type();
ret.resize(out - &ret[0]); ret.resize(out - &ret[0]);
return ret; return ret;

View File

@ -12,3 +12,10 @@ TEST(BinaryTest, DecodingNoCrashOnNegative) {
const std::vector<unsigned char> &result = YAML::DecodeBase64(input); const std::vector<unsigned char> &result = YAML::DecodeBase64(input);
EXPECT_TRUE(result.empty()); EXPECT_TRUE(result.empty());
} }
TEST(BinaryTest, DecodingIncompleteString) {
// Note: the number of bytes is *not* a multiple of four.
std::string input{90, 71, 86, 104, 90};
const std::vector<unsigned char> &result = YAML::DecodeBase64(input);
EXPECT_TRUE(result.empty());
}