From 8cbeb7cf3604c42bdd1b11b2235667695a1f7e20 Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Thu, 5 Mar 2015 14:57:11 -0800 Subject: [PATCH] Prevent invalid memory access Change-Id: I1b972c945274254d896d772d859840b2f8211b4f --- vp9/encoder/vp9_encodeframe.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 2f04454ef..c6f71b87b 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -748,8 +748,11 @@ static void choose_partitioning(VP9_COMP *cpi, #else const BLOCK_SIZE bs = get_plane_block_size(BLOCK_64X64, pd); #endif - uv_sad = cpi->fn_ptr[bs].sdf(p->src.buf, p->src.stride, - pd->dst.buf, pd->dst.stride); + if (bs == BLOCK_INVALID) + uv_sad = INT_MAX; + else + uv_sad = cpi->fn_ptr[bs].sdf(p->src.buf, p->src.stride, + pd->dst.buf, pd->dst.stride); #if GLOBAL_MOTION x->color_sensitivity[i - 1] = uv_sad * 4 > y_sad; -- 2.50.1