generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Optimize output buffer size check in base64 decode.

Browse Source 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2012-01-20 22:14:20 +01:00
parent 686ba5f4ea
commit 6af4c9814a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavutil/base64.c
View File

@ -47,6 +47,7 @@ int av_base64_decode(uint8_t *out, const char *in, int out_size)
{ {
int i, v; int i, v;
uint8_t *dst = out; uint8_t *dst = out;
uint8_t *end = out + out_size;
v = 0; v = 0;
for (i = 0; ; i++) { for (i = 0; ; i++) {
@ -55,7 +56,7 @@ int av_base64_decode(uint8_t *out, const char *in, int out_size)
return in[i] && in[i] != '=' ? -1 : dst - out; return in[i] && in[i] != '=' ? -1 : dst - out;
v = (v << 6) + map2[index]; v = (v << 6) + map2[index];
if (i & 3) { if (i & 3) {
if (dst - out < out_size) { if (dst < end) {
*dst++ = v >> (6 - 2 * (i & 3)); *dst++ = v >> (6 - 2 * (i & 3));
} }
} }