diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-22 12:09:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-22 12:09:59 +0200 |
| commit | fa5dacce143f3fbe8eac14d5a99e926b2787e9e6 (patch) | |
| tree | 6177ae85596a49b6e871e984b4ee7e20a5120483 | |
| parent | 2a59abf1a8859bd63f5760e98ffcb381d407451d (diff) | |
| download | ffmpeg-fa5dacce143f3fbe8eac14d5a99e926b2787e9e6.tar.gz | |
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>
| -rw-r--r-- | libavcodec/indeo5.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index 5614e80519..1945f06a3f 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -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); |