aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2018-12-27 01:51:53 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-12-27 01:51:53 +0000
commit3bb4fe68a62afd3c670ad9a8cc79ac100526b561 (patch)
tree914116bce1c4a12f1d24b7a64bf0eefc2a9b97b2
parentaea2558c50377deed467bbaa5d259b4a0a29d409 (diff)
parent1450575edff0ba55e5d253737bfeb7792f4386b9 (diff)
downloadfdk-aac-3bb4fe68a62afd3c670ad9a8cc79ac100526b561.tar.gz
fdk-aac-3bb4fe68a62afd3c670ad9a8cc79ac100526b561.tar.bz2
fdk-aac-3bb4fe68a62afd3c670ad9a8cc79ac100526b561.zip
Merge "Signed Integer Overflow in CLpd_FAC_Acelp2Mdct()"
-rw-r--r--libAACdec/src/usacdec_fac.cpp4
1 files changed, 2 insertions, 2 deletions
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 @@ INT CLpd_FAC_Acelp2Mdct(H_MDCT hMdct, FIXP_DBL *output, FIXP_DBL *_pSpec,
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 @@ INT CLpd_FAC_Acelp2Mdct(H_MDCT hMdct, FIXP_DBL *output, FIXP_DBL *_pSpec,
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) {