aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-01-23 01:42:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-01-23 01:42:05 +0000
commitbd868287e9356fcb17141f18e0c5a9065b877930 (patch)
tree7c94ca1ca030e6a40b10aa9ce29a20a884644def
parentf0ee84c4b9226137e75933faee39cbf63348062a (diff)
parentacd1da2eb8530940fa77c351440910919354534c (diff)
downloadlibxaac-bd868287e9356fcb17141f18e0c5a9065b877930.tar.gz
Merge "Fix for integer overflow in ixheaacd_block.c file"
-rw-r--r--decoder/ixheaacd_block.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/decoder/ixheaacd_block.c b/decoder/ixheaacd_block.c
index 57c1e8f..2784edd 100644
--- a/decoder/ixheaacd_block.c
+++ b/decoder/ixheaacd_block.c
@@ -59,7 +59,9 @@ static PLATFORM_INLINE WORD32 ixheaacd_shr32_drc(WORD32 a, WORD32 b) {
WORD32 out_val;
b = ((UWORD32)(b << 24) >> 24);
- if (b >= 31) {
+ if (b == 0) {
+ out_val = a;
+ } else if (b >= 31) {
if (a < 0)
out_val = -1;
else