FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid a data copy decoding base64 data.

Browse Source 
Use an out parameter to avoid a buffer alloc/copy/free cycle
when returning base64-decoded data.
This commit is contained in:
James Turner
2013-10-09 10:03:30 +02:00
parent 2f023803e7
commit 23140e3bf7
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/misc/strutils.cxx
+3 -6
View File
@@ -370,14 +370,13 @@ static bool is_whitespace(unsigned char c) {
return ((c == ' ') || (c == '\r') || (c == '\n'));
}
std::string decodeBase64(const std::string& encoded_string)
void decodeBase64(const std::string& encoded_string, std::vector<unsigned char>& ret)
{
int in_len = encoded_string.size();
int i = 0;
int j = 0;
int in_ = 0;
unsigned char char_array_4[4], char_array_3[3];
std::string ret;
while (in_len-- && ( encoded_string[in_] != '=')) {
if (is_whitespace( encoded_string[in_])) {
@@ -399,7 +398,7 @@ std::string decodeBase64(const std::string& encoded_string)
char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
for (i = 0; (i < 3); i++)
ret += char_array_3[i];
ret.push_back(char_array_3[i]);
i = 0;
}
}
@@ -415,10 +414,8 @@ std::string decodeBase64(const std::string& encoded_string)
char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
for (j = 0; (j < i - 1); j++) ret += char_array_3[j];
for (j = 0; (j < i - 1); j++) ret.push_back(char_array_3[j]);
}
return ret;
}
const char hexChar[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};