diff options
author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2012-01-20 22:14:20 +0100 |
---|---|---|
committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2012-01-20 23:28:26 +0100 |
commit | 6af4c9814adb9fd87d2de723473c76e53e2c2b37 (patch) | |
tree | fa9b744bd3ac4eb396a04bad37d4ae06c78558e2 /libavutil/base64.c | |
parent | 686ba5f4eabf123e710d03ed0ee73e787a424408 (diff) | |
download | ffmpeg-6af4c9814adb9fd87d2de723473c76e53e2c2b37.tar.gz |
Optimize output buffer size check in base64 decode.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diffstat (limited to 'libavutil/base64.c')
-rw-r--r-- | libavutil/base64.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/base64.c b/libavutil/base64.c index 6843a5396a..5a7ab4c977 100644 --- a/libavutil/base64.c +++ b/libavutil/base64.c @@ -47,6 +47,7 @@ int av_base64_decode(uint8_t *out, const char *in, int out_size) { int i, v; uint8_t *dst = out; + uint8_t *end = out + out_size; v = 0; 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; v = (v << 6) + map2[index]; if (i & 3) { - if (dst - out < out_size) { + if (dst < end) { *dst++ = v >> (6 - 2 * (i & 3)); } } |