From ab80d3fb3a7595db44fc143c80f8c2a3480fe28d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 3 Jul 2015 23:03:25 +0200 Subject: swscale/output: fix null pointer dereference in yuv2ya8_2_c() Signed-off-by: Michael Niedermayer --- libswscale/output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libswscale') diff --git a/libswscale/output.c b/libswscale/output.c index 09e3369ffc..582eb5b909 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; -- cgit v1.2.3