virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

rv20: prevent calling ff_h263_decode_mba() with unset height/width

Browse Source 
Prevents a crash of VLC during playback of a invalid matroska file,
found by John Villamil <johnv@matasano.com>.

CC: libav-stable@libav.org
This commit is contained in:
Janne Grunau 2012-01-24 21:50:50 +01:00
parent 4e81b5f517
commit c3e10ae412
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/rv10.c
View File

@ -362,7 +362,8 @@ static int rv20_decode_picture_header(MpegEncContext *s)
if(s->avctx->debug & FF_DEBUG_PICT_INFO){ if(s->avctx->debug & FF_DEBUG_PICT_INFO){
av_log(s->avctx, AV_LOG_DEBUG, "F %d/%d\n", f, rpr_bits); av_log(s->avctx, AV_LOG_DEBUG, "F %d/%d\n", f, rpr_bits);
} }
} } else if (av_image_check_size(s->width, s->height, 0, s->avctx) < 0)
return AVERROR_INVALIDDATA;
mb_pos = ff_h263_decode_mba(s); mb_pos = ff_h263_decode_mba(s);