[FFmpeg-cvslog] swscale/output: fix null pointer dereference in yuv2ya8_2_c()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul  3 23:03:25 2015 +0200| [ab80d3fb3a7595db44fc143c80f8c2a3480fe28d] | committer: Michael Niedermayer

swscale/output: fix null pointer dereference in yuv2ya8_2_c()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab80d3fb3a7595db44fc143c80f8c2a3480fe28d
---

 libswscale/output.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libswscale/output.c b/libswscale/output.c
index 09e3369..582eb5b 100644
--- a/libswscale/output.c
+++ b/libswscale/output.c
@@ -1949,7 +1949,7 @@ yuv2ya8_2_c(SwsContext *c, const int16_t *buf[2],
             const int16_t *abuf[2], uint8_t *dest, int dstW,
             int yalpha, int uvalpha, int y)
 {
-    int hasAlpha = abuf[0] && abuf[1];
+    int hasAlpha = abuf && abuf[0] && abuf[1];
     const int16_t *buf0  = buf[0],  *buf1  = buf[1],
                   *abuf0 = hasAlpha ? abuf[0] : NULL,
                   *abuf1 = hasAlpha ? abuf[1] : NULL;