diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2017-11-03 19:10:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-03 19:10:04 +0000 |
| commit | 6fac7101c680741bd2cf763ce8ed7c16fd169321 (patch) | |
| tree | 23d80c3b7ee8db1ebe5603fd7be50033edbdd2f0 | |
| parent | d110691d01e15a555d84fcd98e4b275dd38b37ba (diff) | |
| parent | 070e7b81c0d673cfafba5a41914259503d459adf (diff) | |
| download | fdk-aac-6fac7101c680741bd2cf763ce8ed7c16fd169321.tar.gz fdk-aac-6fac7101c680741bd2cf763ce8ed7c16fd169321.tar.bz2 fdk-aac-6fac7101c680741bd2cf763ce8ed7c16fd169321.zip | |
DO NOT MERGE Prevent out of bound memory access in GetInvInt
am: 070e7b81c0
Change-Id: Ibcddd5c0e53aaae0d26e1c33c6e42bc7268cf6a1
| -rw-r--r-- | libFDK/include/fixpoint_math.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libFDK/include/fixpoint_math.h b/libFDK/include/fixpoint_math.h index df141d3..26c001f 100644 --- a/libFDK/include/fixpoint_math.h +++ b/libFDK/include/fixpoint_math.h @@ -450,15 +450,19 @@ inline FIXP_DBL fAddSaturate(const FIXP_DBL a, const FIXP_DBL b) /** * \brief Calculate the value of 1/i where i is a integer value. It supports - * input values from 1 upto 50. + * input values from 0 upto 49. * \param intValue Integer input value. * \param FIXP_DBL representation of 1/intValue */ inline FIXP_DBL GetInvInt(int intValue) { - FDK_ASSERT((intValue > 0) && (intValue < 50)); - FDK_ASSERT(intValue<50); - return invCount[intValue]; + FDK_ASSERT((intValue >= 0) && (intValue < 50)); + if (intValue < 0) + return invCount[0]; + else if (intValue > 49) + return invCount[49]; + else + return invCount[intValue]; } |