From 7bab631f7df55b361368296f125b95a1814bc18c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 6 Mar 2013 01:37:49 +0100 Subject: mss2dsp/upsample_plane: fix 0x0 handling Fixes invalid memcpy and out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/mss2dsp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/mss2dsp.c b/libavcodec/mss2dsp.c index b18bf1f0a9..c5fc1f8dcf 100644 --- a/libavcodec/mss2dsp.c +++ b/libavcodec/mss2dsp.c @@ -106,6 +106,9 @@ static void upsample_plane_c(uint8_t *plane, int plane_stride, int w, int h) uint8_t *src1, *src2, *dst1, *dst2, *p, a, b; int i, j; + if(!w || !h) + return; + w += (w & 1); h += (h & 1); -- cgit v1.2.3