andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Use exact size formula in base64_decode.

Browse Source 
GitOrigin-RevId: 7515474fc70af351e7b886e870b0d3da453afdc8
This commit is contained in:
levlam 2020-01-09 22:21:20 +03:00
parent 7db7757d2d
commit 09d359cdc4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tdutils/td/utils/base64.cpp
View File

@ -121,7 +121,7 @@ Result<string> base64_decode(Slice base64) {
TRY_RESULT_ASSIGN(base64, base64_drop_padding<false>(base64));
string output;
output.reserve(((base64.size() + 3) >> 2) * 3);
output.reserve((base64.size() >> 2) * 3 + (((base64.size() & 3) + 1) >> 1));
TRY_STATUS(base64_do_decode<false>(base64, [&output](char c) { output += c; }));
return output;
}
@ -129,14 +129,10 @@ Result<string> base64_decode(Slice base64) {
Result<SecureString> base64_decode_secure(Slice base64) {
TRY_RESULT_ASSIGN(base64, base64_drop_padding<false>(base64));
SecureString output(((base64.size() + 3) >> 2) * 3);
SecureString output((base64.size() >> 2) * 3 + (((base64.size() & 3) + 1) >> 1));
char *ptr = output.as_mutable_slice().begin();
TRY_STATUS(base64_do_decode<false>(base64, [&ptr](char c) { *ptr++ = c; }));
size_t size = ptr - output.as_mutable_slice().begin();
if (size == output.size()) {
return std::move(output);
}
return SecureString(output.as_slice().substr(0, size));
return std::move(output);
}
string base64_encode(Slice input) {
@ -151,7 +147,7 @@ Result<string> base64url_decode(Slice base64) {
TRY_RESULT_ASSIGN(base64, base64_drop_padding<true>(base64));
string output;
output.reserve(((base64.size() + 3) >> 2) * 3);
output.reserve((base64.size() >> 2) * 3 + (((base64.size() & 3) + 1) >> 1));
TRY_STATUS(base64_do_decode<true>(base64, [&output](char c) { output += c; }));
return output;
}

4
tdutils/test/misc.cpp
View File

@ -223,6 +223,10 @@ TEST(Misc, base64) {
decoded = base64_decode(encoded);
ASSERT_TRUE(decoded.is_ok());
ASSERT_TRUE(decoded.ok() == s);
auto decoded_secure = base64_decode_secure(encoded);
ASSERT_TRUE(decoded_secure.is_ok());
ASSERT_TRUE(decoded_secure.ok().as_slice() == s);
}
}