commit d3e72584588ad0fafc726bcfdea4aec54b364584
author android-build-team Robot <android-build-team-robot@google.com> Mon Nov 26 18:48:22 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Nov 26 18:48:22 2018 +0000
tree 1acf31c9810f4b6bb2d739c366840dbfd9465cb3
parent f237a61128139b7bf2f455c56bd54b5001a00613
parent fbcd564c499bc90c519a696d078e6bbf8ed7fd9b

Snap for 5140444 from fbcd564c499bc90c519a696d078e6bbf8ed7fd9b to pi-qpr2-release

Change-Id: I02fea4a8e1d699f1aeb3fbd76aafdfdc53fc0881

decoder/drc_src/impd_drc_dynamic_payload.c

diff --git a/decoder/drc_src/impd_drc_dynamic_payload.c b/decoder/drc_src/impd_drc_dynamic_payload.c
index d3faf30..35a3c37 100644
--- a/decoder/drc_src/impd_drc_dynamic_payload.c
+++ b/decoder/drc_src/impd_drc_dynamic_payload.c
@@ -638,8 +638,6 @@
       if (it_bit_buff->error) return it_bit_buff->error;
 
       str_filter_element->filt_ele_idx = (temp & 0x7E) >> 1;
-      if (str_filter_element->filt_ele_idx >= FILTER_ELEMENT_COUNT_MAX)
-        return (UNEXPECTED_ERROR);
       str_filter_element->filt_ele_gain_flag = temp & 1;
       ;
 
@@ -1018,17 +1016,10 @@
     str_filter_block_refs->filter_block_count =
         impd_read_bits_buf(it_bit_buff, 4);
     if (it_bit_buff->error) return it_bit_buff->error;
-    if (str_filter_block_refs->filter_block_count > EQ_FILTER_BLOCK_COUNT_MAX) {
-      return (UNEXPECTED_ERROR);
-    }
-
     for (ii = 0; ii < str_filter_block_refs->filter_block_count; ii++) {
       str_filter_block_refs->filter_block_index[ii] =
           impd_read_bits_buf(it_bit_buff, 7);
       if (it_bit_buff->error) return it_bit_buff->error;
-      if (str_filter_block_refs->filter_block_index[ii] >=
-          FILTER_BLOCK_COUNT_MAX)
-        return (UNEXPECTED_ERROR);
     }
     str_filter_block_refs++;
   }

decoder/ixheaacd_mps_parse.c

diff --git a/decoder/ixheaacd_mps_parse.c b/decoder/ixheaacd_mps_parse.c
index 3d9bde9..e5ba760 100644
--- a/decoder/ixheaacd_mps_parse.c
+++ b/decoder/ixheaacd_mps_parse.c
@@ -1063,8 +1063,6 @@
     }
   }
 
-  if (self->num_bands_ipd > MAX_PARAMETER_BANDS) return -1;
-
   self->dir_sig_count = 1;
   self->decor_sig_count = 1;