virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avcodec/mpeg12dec: check slice size before trying to decode it

Browse Source 
Fixes assertion failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-13 19:36:50 +02:00
parent 6a64b23d93
commit 9706401927
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mpeg12dec.c
View File

@ -2299,6 +2299,11 @@ static int decode_chunks(AVCodecContext *avctx,
if (s2->picture_structure == PICT_BOTTOM_FIELD) if (s2->picture_structure == PICT_BOTTOM_FIELD)
mb_y++; mb_y++;
if (buf_end - buf_ptr < 2) {
av_log(s2->avctx, AV_LOG_ERROR, "slice too small\n");
return AVERROR_INVALIDDATA;
}
if (mb_y >= s2->mb_height) { if (mb_y >= s2->mb_height) {
av_log(s2->avctx, AV_LOG_ERROR, "slice below image (%d >= %d)\n", mb_y, s2->mb_height); av_log(s2->avctx, AV_LOG_ERROR, "slice below image (%d >= %d)\n", mb_y, s2->mb_height);
return -1; return -1;