From 3635c07bd1d1202e98f439f3b5389ff142d87cc3 Mon Sep 17 00:00:00 2001 From: Jai Menon Date: Sun, 23 May 2010 19:13:17 +0000 Subject: [PATCH] FFplay : Avoid manipulating NULL data pointers so that future checks remain valid. This fixes segfaults for those cases where data copy to this invalid pointer is attempted. Originally committed as revision 23264 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffplay.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ffplay.c b/ffplay.c index a48891e4f..7b208480f 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1591,7 +1591,9 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic) unsigned hshift = i == 0 ? 0 : av_pix_fmt_descriptors[ref->pic->format].log2_chroma_w; unsigned vshift = i == 0 ? 0 : av_pix_fmt_descriptors[ref->pic->format].log2_chroma_h; + if (ref->data[i]) { ref->data[i] += (edge >> hshift) + ((edge * ref->linesize[i]) >> vshift); + } pic->data[i] = ref->data[i]; pic->linesize[i] = ref->linesize[i]; } -- 2.11.0