commit 29b81acd78887b24c2995f89c7c34e1861afad69
author Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> Wed Aug 15 14:40:03 2018 +0200
committer Jean-Michel Trivi <jmtrivi@google.com> Thu Dec 27 12:45:31 2018 -0500
tree 83a3cb04914ebea51ae0cb78f76bfacfeed7d631
parent 55930c28afb15d2a05ef5106e887d3e6b998524d

Limit too large shift exponent in apply_inter_tes()

Bug: 112892200
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I74e349ecb796343b475b825ac7d97497560a1e7a

libSBRdec/src/env_calc.cpp

diff --git a/libSBRdec/src/env_calc.cpp b/libSBRdec/src/env_calc.cpp
index d7a8bb5..da01bed 100644
--- a/libSBRdec/src/env_calc.cpp
+++ b/libSBRdec/src/env_calc.cpp
@@ -626,7 +626,8 @@
         total_power_low >>= diff;
         total_power_low_sf = new_summand_sf;
       } else if (new_summand_sf < total_power_low_sf) {
-        new_summand >>= total_power_low_sf - new_summand_sf;
+        new_summand >>=
+            fMin(DFRACT_BITS - 1, total_power_low_sf - new_summand_sf);
       }
 
       total_power_low += (new_summand >> preShift2);
@@ -638,7 +639,8 @@
             fMin(DFRACT_BITS - 1, new_summand_sf - total_power_high_sf);
         total_power_high_sf = new_summand_sf;
       } else if (new_summand_sf < total_power_high_sf) {
-        new_summand >>= total_power_high_sf - new_summand_sf;
+        new_summand >>=
+            fMin(DFRACT_BITS - 1, total_power_high_sf - new_summand_sf);
       }
 
       total_power_high += (new_summand >> preShift2);