Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DecodeBase64 returns empty string on *all* errors #1338

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

DecodeBase64 returns empty string on *all* errors #1338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/binary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ std::vector<unsigned char> DecodeBase64(const std::string &input) {
unsigned char *out = &ret[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]))) {
// skip newlines
continue;
Expand All @@ -84,15 +85,20 @@ std::vector<unsigned char> DecodeBase64(const std::string &input) {
return ret_type();

value = (value << 6) | d;
if (cnt % 4 == 3) {
if (cnt == 3) {
*out++ = value >> 16;
if (i > 0 && input[i - 1] != '=')
*out++ = value >> 8;
if (input[i] != '=')
*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]);
return ret;
Expand Down
7 changes: 7 additions & 0 deletions test/binary_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,10 @@ TEST(BinaryTest, DecodingNoCrashOnNegative) {
const std::vector<unsigned char> &result = YAML::DecodeBase64(input);
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());
}