Commit 960964f5 authored by Michael Niedermayer's avatar Michael Niedermayer

fix segfault with lol-ffplay2.mpg (dunno if this is exploitable, probably not easily)

Originally committed as revision 7889 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f7a49547
...@@ -2593,6 +2593,10 @@ static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y, ...@@ -2593,6 +2593,10 @@ static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y,
break; break;
} }
} }
if(s->mb_x >= (unsigned)s->mb_width){
av_log(s->avctx, AV_LOG_ERROR, "initial skip overflow\n");
return -1;
}
s->resync_mb_x= s->mb_x; s->resync_mb_x= s->mb_x;
s->resync_mb_y= s->mb_y= mb_y; s->resync_mb_y= s->mb_y= mb_y;
......
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