commit 3eb739ab1d4d6218acdeffe7a1be22f27c4513ab
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Mar 09 22:27:29 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 09 22:27:29 2020 +0000
tree e7b98c43dec8c38db223f6a3312a514bdbf2b069
parent 7a984f6ccc04d61df1cecf097e2c33dcf42d287c
parent 5426a0bf19e497bd2142f113866df6d6ce92e13e

Merge "Fix for read buffer overflow in impd_filter_banks_process" into rvc-dev

decoder/ixheaacd_common_initfuncs.c

diff --git a/decoder/ixheaacd_common_initfuncs.c b/decoder/ixheaacd_common_initfuncs.c
index 8b9930f..88fadcc 100644
--- a/decoder/ixheaacd_common_initfuncs.c
+++ b/decoder/ixheaacd_common_initfuncs.c
@@ -158,12 +158,13 @@
                                WORD32 ixheaacd_drc_offset) {
   if (ixheaacd_drc_offset != 0) {
     WORD32 byte_offset;
-
-    it_bit_buff->cnt_bits = it_bit_buff->cnt_bits - ixheaacd_drc_offset;
-    if (it_bit_buff->cnt_bits < 0) {
+    if ((it_bit_buff->cnt_bits < 0) ||
+        (it_bit_buff->cnt_bits - ixheaacd_drc_offset < 0) ||
+        (it_bit_buff->cnt_bits - ixheaacd_drc_offset > it_bit_buff->size)) {
       longjmp(*(it_bit_buff->xaac_jmp_buf),
               IA_ENHAACPLUS_DEC_EXE_NONFATAL_INSUFFICIENT_INPUT_BYTES);
     }
+    it_bit_buff->cnt_bits = it_bit_buff->cnt_bits - ixheaacd_drc_offset;
     it_bit_buff->bit_pos = it_bit_buff->bit_pos - ixheaacd_drc_offset;
     byte_offset = it_bit_buff->bit_pos >> 3;
     it_bit_buff->bit_pos = it_bit_buff->bit_pos - (byte_offset << 3);