commit 2373e71ff8e3f113d7879f282572ae3722b7ac04
author Ivan Lozano <ivanlozano@google.com> Wed Dec 12 13:17:32 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 12 13:17:32 2018 -0800
tree 37a1b26326e4949a075314bf37e9d604552fba04
parent 3c54bd3b6db9078850edca1961cee1ec6f5521ee
parent c03a49ab12740e2c26f3bd8b6d96957701411229

Merge "Enable bounds sanitization in libaac." am: cdaf85d874
am: c03a49ab12

Change-Id: If2c1b228bb95708f59ef485c6ccc0275d4681a00

libAACdec/src/conceal.cpp

diff --git a/libAACdec/src/conceal.cpp b/libAACdec/src/conceal.cpp
index a6064b6..569d672 100644
--- a/libAACdec/src/conceal.cpp
+++ b/libAACdec/src/conceal.cpp
@@ -2080,11 +2080,11 @@
       noiseVal = FX_DBL2FX_PCM(fMult(noiseValLong, TDNoiseAtt));
 
       /* add filtered noise - check for clipping, before */
-      if (pcmdata[ii] > (FIXP_PCM)MAXVAL_FIXP_PCM - noiseVal &&
-          noiseVal > (FIXP_PCM)0) {
+      if (noiseVal > (FIXP_PCM)0 &&
+          pcmdata[ii] > (FIXP_PCM)MAXVAL_FIXP_PCM - noiseVal) {
         noiseVal = noiseVal * (FIXP_PCM)-1;
-      } else if (pcmdata[ii] < (FIXP_PCM)MINVAL_FIXP_PCM - noiseVal &&
-                 noiseVal < (FIXP_PCM)0) {
+      } else if (noiseVal < (FIXP_PCM)0 &&
+                 pcmdata[ii] < (FIXP_PCM)MINVAL_FIXP_PCM - noiseVal) {
         noiseVal = noiseVal * (FIXP_PCM)-1;
       }