indeo5: check against scaleable frames in non scaleable streams.
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Apr 2012 10:09:59 +0000 (12:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Apr 2012 10:09:59 +0000 (12:09 +0200)
Fixes a null ptr dereference.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/indeo5.c

index 5614e80..1945f06 100644 (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);