ffmpeg | branch: release/2.8 | Michael Niedermayer <mich...@niedermayer.cc> | Mon Oct 9 11:49:28 2017 +0200| [f62201d550a3ba790d262b7a8253b8c7541989ad] | committer: Michael Niedermayer
avcodec/ffv1dec: Fix out of array read in slice counting Fixes: test-201710.mp4 Found-by: 连一汉 <lianyi...@360.cn> and Zhibin Hu Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> (cherry picked from commit c20f4fcb74da2d0432c7b54499bb98f48236b904) Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f62201d550a3ba790d262b7a8253b8c7541989ad --- libavcodec/ffv1dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index ba4c8c1a55..a05d398cfd 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -792,7 +792,7 @@ static int read_header(FFV1Context *f) } else { const uint8_t *p = c->bytestream_end; for (f->slice_count = 0; - f->slice_count < MAX_SLICES && 3 < p - c->bytestream_start; + f->slice_count < MAX_SLICES && 3 + 5*!!f->ec < p - c->bytestream_start; f->slice_count++) { int trailer = 3 + 5*!!f->ec; int size = AV_RB24(p-trailer); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
