From 2c3439b0089f45051970689df7f75e0aa16ad5a6 Mon Sep 17 00:00:00 2001
From: Reinhard Tartler <siretart@tauware.de>
Date: Tue, 25 May 2010 20:55:57 +0000
Subject: 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.

backport r23264 by jai_menon


Originally committed as revision 23326 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
---
 ffplay.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ffplay.c b/ffplay.c
index e84e290be7..4a0e42ec2f 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1593,7 +1593,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];
     }
-- 
cgit v1.2.3