sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged in AVyhovanec/apps (pull request #158)

Browse Source 
"dst" overflow protection when base64 string ends with "="

Approved-by: GregoryN <gnutt@nuttx.org>
This commit is contained in:
Aleksandr Vyhovanec 2018-10-19 12:29:12 +00:00 committed by GregoryN
parent 0989023de7
commit 9aa2f5c5a2
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
netutils/codecs/base64.c
View File

@ -290,24 +290,20 @@ static unsigned char *_base64_decode(const unsigned char *src, size_t len,
if (count == 4) if (count == 4)
{ {
*pos++ = (block[0] << 2) | (block[1] >> 4); *pos++ = (block[0] << 2) | (block[1] >> 4);
if (in[2] == ch) /* if (in[2] == '=') */
{
break;
}
*pos++ = (block[1] << 4) | (block[2] >> 2); *pos++ = (block[1] << 4) | (block[2] >> 2);
if (in[3] == ch) /* if (in[3] == '=') */
{
break;
}
*pos++ = (block[2] << 6) | block[3]; *pos++ = (block[2] << 6) | block[3];
count = 0; count = 0;
} }
} }
if (pos > out)
{
if (in[2] == ch) /* if (in[2] == '=') */
{
pos -= 2;
}
else if (in[3] == ch) /* else if (in[3] == '=') */
{
pos--;
}
}
*out_len = pos - out; *out_len = pos - out;
return out; return out;
} }