Amebis/WinStd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Range control for Base64 decoding added

Browse Source
This commit is contained in:
Simon Rozman 2016-05-16 20:32:41 +02:00
parent 8dd01573d4
commit 812b746ef3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/WinStd/Base64.h
View File

@ -166,14 +166,14 @@ namespace winstd
template <class T> template <class T>
inline void decode(_Out_ std::vector<unsigned char> &out, _Out_ bool &is_last, _In_z_count_(size) const T *data, _In_ size_t size) inline void decode(_Out_ std::vector<unsigned char> &out, _Out_ bool &is_last, _In_z_count_(size) const T *data, _In_ size_t size)
{ {
size_t i = 0, j = 0, nibbles; size_t i = 0, j = 0;
is_last = false; is_last = false;
for (;;) { for (;;) {
if (num >= 4) { if (num >= 4) {
// Buffer full; decode it. // Buffer full; decode it.
nibbles = decode(out, buf); size_t nibbles = decode(out, buf);
j += nibbles; j += nibbles;
num = 0; num = 0;
if (nibbles < 3) { if (nibbles < 3) {
@ -185,7 +185,8 @@ namespace winstd
if (i >= size || !data[i]) if (i >= size || !data[i])
break; break;
if ((buf[num] = lookup[(unsigned char)data[i++]]) != 255) int x = data[i++];
if ((buf[num] = x < _countof(lookup) ? lookup[x] : 255) != 255)
num++; num++;
} }
} }