commit 3bb4fe68a62afd3c670ad9a8cc79ac100526b561
author Jean-Michel Trivi <jmtrivi@google.com> Thu Dec 27 01:51:53 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 27 01:51:53 2018 +0000
tree 914116bce1c4a12f1d24b7a64bf0eefc2a9b97b2
parent aea2558c50377deed467bbaa5d259b4a0a29d409
parent 1450575edff0ba55e5d253737bfeb7792f4386b9

Merge "Signed Integer Overflow in CLpd_FAC_Acelp2Mdct()"

libAACdec/src/usacdec_fac.cpp

diff --git a/libAACdec/src/usacdec_fac.cpp b/libAACdec/src/usacdec_fac.cpp
index 6b595d4..25d3119 100644
--- a/libAACdec/src/usacdec_fac.cpp
+++ b/libAACdec/src/usacdec_fac.cpp
@@ -538,7 +538,7 @@
   if (total_gain != (FIXP_DBL)0) {
     scaleValuesWithFactor(pSpec, total_gain, tl, spec_scale[0] + scale);
   } else {
-    scaleValues(pSpec, tl, spec_scale[0] + scale);
+    scaleValuesSaturate(pSpec, tl, spec_scale[0] + scale);
   }
 
   pOut1 += fl / 2 - 1;
@@ -627,7 +627,7 @@
     if (total_gain != (FIXP_DBL)0) {
       scaleValuesWithFactor(pSpec, total_gain, tl, spec_scale[w] + scale);
     } else {
-      scaleValues(pSpec, tl, spec_scale[w] + scale);
+      scaleValuesSaturate(pSpec, tl, spec_scale[w] + scale);
     }
 
     if (noOutSamples <= nrSamples) {