RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

indeo5: check against scaleable frames in non scaleable streams. 

Fixes a null ptr dereference.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-04-22 12:09:59 +02:00
parent 2a59abf1a8
commit fa5dacce14
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/indeo5.c
View File

@ -356,6 +356,12 @@ static int decode_pic_hdr(IVI5DecContext *ctx, AVCodecContext *avctx)
ctx->gop_invalid = 0;
}
if (ctx->frame_type == FRAMETYPE_INTER_SCAL && !ctx->is_scalable) {
av_log(avctx, AV_LOG_ERROR, "Scalable inter frame in non scaleable stream\n");
ctx->frame_type = FRAMETYPE_INTER;
return AVERROR_INVALIDDATA;
}
if (ctx->frame_type != FRAMETYPE_NULL) {
ctx->frame_flags = get_bits(&ctx->gb, 8);