From e9cb533fbb90c274cfed07b69ebf5c1989573e20 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 13 Nov 2012 00:21:59 +0100 Subject: [PATCH] flashv: check if keyframe is available, fix null deref. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/flashsv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 643dab334a..14c514c361 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -406,6 +406,10 @@ static int flashsv_decode_frame(AVCodecContext *avctx, void *data, int k; int off = (s->image_height - y_pos - 1) * s->frame.linesize[0]; + if (!s->keyframe) { + av_log(avctx, AV_LOG_ERROR, "no keyframe yet\n"); + return AVERROR_INVALIDDATA; + } for (k = 0; k < cur_blk_height; k++) memcpy(s->frame.data[0] + off - k*s->frame.linesize[0] + x_pos*3, s->keyframe + off - k*s->frame.linesize[0] + x_pos*3,