From 1b5ec6a0c3309e7a051751b2f989ffa068516d93 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 14 Aug 2014 05:32:44 +0200 Subject: [PATCH] avcodec/fic: Check if a frame is available before using it Fixes null pointer dereference Fixes: ficvf.avi Found-by: Piotr Bandurski Signed-off-by: Michael Niedermayer --- libavcodec/fic.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/fic.c b/libavcodec/fic.c index d08d240efe..5615e69abc 100644 --- a/libavcodec/fic.c +++ b/libavcodec/fic.c @@ -282,8 +282,13 @@ static int fic_decode_frame(AVCodecContext *avctx, void *data, av_log(avctx, AV_LOG_WARNING, "Invalid FIC Header.\n"); /* Is it a skip frame? */ - if (src[17]) + if (src[17]) { + if (!ctx->final_frame) { + av_log(avctx, AV_LOG_WARNING, "Initial frame is skipped\n"); + return AVERROR_INVALIDDATA; + } goto skip; + } nslices = src[13]; if (!nslices) {