From: Yaowu Xu <yaowu@google.com>
Date: Thu, 5 Mar 2015 22:57:11 +0000 (-0800)
Subject: Prevent invalid memory access
X-Git-Tag: v1.4.0~79^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8cbeb7cf3604c42bdd1b11b2235667695a1f7e20;p=libvpx

Prevent invalid memory access

Change-Id: I1b972c945274254d896d772d859840b2f8211b4f
---

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;