commit 208c74d62a3e1039dc87818306e057877760fbaa
author Hamsalekha S <hamsalekha.s@ittiam.com> Fri Sep 08 14:22:22 2017 +0530
committer Marco Nelissen <marcone@google.com> Mon Sep 11 20:16:47 2017 +0000
tree 7d2cd741fa80dcfdd40b11eed3fbea7199500448
parent cbcd2846fa837e4be6d35f5c1211b070bc8d26da

Decoder: Updated error check while parsing num_ref_idx_lx_active.

Added an error check on the lower limit of u1_num_ref_idx_lx_active,
while parsing slice header. The minimum possible value is 1.

Bug: 64836894

Change-Id: I57056851fc135ed00f7a10af5c81eb560e9e12de

decoder/ih264d_parse_bslice.c

diff --git a/decoder/ih264d_parse_bslice.c b/decoder/ih264d_parse_bslice.c
index 443dec2..f2a1b01 100644
--- a/decoder/ih264d_parse_bslice.c
+++ b/decoder/ih264d_parse_bslice.c
@@ -1398,7 +1398,8 @@
         {
             u1_max_ref_idx = MAX_FRAMES << 1;
         }
-        if((u4_temp > u1_max_ref_idx) || (ui_temp1 > u1_max_ref_idx))
+        if((u4_temp > u1_max_ref_idx) || (ui_temp1 > u1_max_ref_idx)
+                        || (u4_temp < 1) || (ui_temp1 < 1))
         {
             return ERROR_NUM_REF;
         }

decoder/ih264d_parse_pslice.c

diff --git a/decoder/ih264d_parse_pslice.c b/decoder/ih264d_parse_pslice.c
index db71b6a..c6ce916 100644
--- a/decoder/ih264d_parse_pslice.c
+++ b/decoder/ih264d_parse_pslice.c
@@ -1957,7 +1957,7 @@
 
 
         UWORD8 u1_max_ref_idx = MAX_FRAMES << u1_field_pic_flag;
-        if(u4_temp > u1_max_ref_idx)
+        if(u4_temp > u1_max_ref_idx || u4_temp < 1)
         {
             return ERROR_NUM_REF;
         }