Browse Source

check len (should fix #1165694)

Originally committed as revision 4436 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Michael Niedermayer 20 years ago
parent
commit
aa6ff39bb0
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      libavcodec/mjpeg.c

+ 2
- 1
libavcodec/mjpeg.c View File

@@ -1585,10 +1585,11 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
{
int len, id;

/* XXX: verify len field validity */
len = get_bits(&s->gb, 16);
if (len < 5)
return -1;
if(8*len + get_bits_count(&s->gb) > s->gb.size_in_bits)
return -1;

id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16);
id = be2me_32(id);


Loading…
Cancel
Save