Commit e3394372 authored by Michael Niedermayer's avatar Michael Niedermayer

verify len field validity in mjpeg_decode_com()

Originally committed as revision 4451 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 1b51e051
......@@ -1728,10 +1728,8 @@ out:
static int mjpeg_decode_com(MJpegDecodeContext *s)
{
/* XXX: verify len field validity */
int len = get_bits(&s->gb, 16);
if (len >= 2 && len < 32768) {
/* XXX: any better upper bound */
if (len >= 2 && 8*len - 16 + get_bits_count(&s->gb) <= s->gb.size_in_bits) {
uint8_t *cbuf = av_malloc(len - 1);
if (cbuf) {
int i;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment