commit f5116913d838adf0bf262d1f2b48d394d7039471
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Wed Apr 20 16:06:51 2016 +0530
committer The Android Automerger <android-build@google.com> Fri May 27 10:27:20 2016 -0700
tree d5808f3d9d171dfc42f07b2f2298657fb792261b
parent 0b24cbee09cc4dc1a73d58ee7b01b38c07235d3b

Decoder: Fix for handling invalid intra mode

Bug: 28165659
Change-Id: I2291a287c27291695f4f3d6e753b6bbd7dfd9e42

decoder/ih264d_process_intra_mb.c

diff --git a/decoder/ih264d_process_intra_mb.c b/decoder/ih264d_process_intra_mb.c
index dde2a7e..279ff87 100644
--- a/decoder/ih264d_process_intra_mb.c
+++ b/decoder/ih264d_process_intra_mb.c
@@ -1242,6 +1242,7 @@
                                                     + (pu1_rem_intra4x4_pred_mode[u1_cur_sub_block]
                                                                     >= i1_intra_pred);
                 }
+                i1_intra_pred = CLIP3(0, 8, i1_intra_pred);
                 {
                     UWORD8 u1_err_code = pu1_intra_err_codes[i1_intra_pred];
 
@@ -1650,6 +1651,7 @@
                                     + (pu1_rem_intra4x4_pred_mode[u1_sub_mb_num]
                                                     >= i1_intra_pred);
                 }
+                i1_intra_pred = CLIP3(0, 8, i1_intra_pred);
                 {
                     UWORD8 u1_err_code = pu1_intra_err_codes[i1_intra_pred];