commit 4330e1bd218c07f577c6d456d438d98dc763a017
author Jingning Han <jingning@google.com> Tue Apr 11 21:05:44 2017 -0700
committer Jingning Han <jingning@google.com> Wed Apr 12 04:49:28 2017 +0000
tree 5d5445ce0efa9d4bf2229cf5164f493045af3de3
parent b1cc1f9d863aa9e7afdc7aebd8a7377a361487e8

Fix out-of-bound access in filter intra

BUG=aomedia:427

Change-Id: Ic7b0f6850d7685f4aff0e51154f8777c9ef72c17

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 6c8154d..19b0620 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -9401,7 +9401,8 @@
   rate2 = rate_y + intra_mode_cost[mbmi->mode] + rate_uv +
           cpi->intra_uv_mode_cost[mbmi->mode][mbmi->uv_mode];
 #if CONFIG_PALETTE
-  if (cpi->common.allow_screen_content_tools && mbmi->mode == DC_PRED)
+  if (cpi->common.allow_screen_content_tools && mbmi->mode == DC_PRED &&
+      bsize >= BLOCK_8X8)
     rate2 += av1_cost_bit(
         av1_default_palette_y_mode_prob[bsize - BLOCK_8X8][palette_ctx], 0);
 #endif  // CONFIG_PALETTE