aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de>2021-04-30 19:30:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-30 19:30:10 +0000
commit6edbc9a7e816074947dac672ffccaa6e58e5c43c (patch)
tree5013476f60c46f7a6790c25e79ab187b2a3f75f3
parent7997eb4a7396c9a345df52667bf3c52992c47456 (diff)
parentd2aca9e020ed71144b56bc28e9f8a2ce16cbf399 (diff)
downloadfdk-aac-6edbc9a7e816074947dac672ffccaa6e58e5c43c.tar.gz
fdk-aac-6edbc9a7e816074947dac672ffccaa6e58e5c43c.tar.bz2
fdk-aac-6edbc9a7e816074947dac672ffccaa6e58e5c43c.zip
Fix stack buffer overflow in Pred_lt4(). am: 22e70729b4 am: d2aca9e020
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387483 Change-Id: Ie51264d592a1a2b6afbdf347b05ac5260e9ef1d0
-rw-r--r--libAACdec/src/usacdec_acelp.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libAACdec/src/usacdec_acelp.cpp b/libAACdec/src/usacdec_acelp.cpp
index a8dadc0..ca1a6a2 100644
--- a/libAACdec/src/usacdec_acelp.cpp
+++ b/libAACdec/src/usacdec_acelp.cpp
@@ -1,7 +1,7 @@
/* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android
-© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten
+© Copyright 1995 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved.
1. INTRODUCTION
@@ -719,7 +719,7 @@ static void ConcealPitchLag(CAcelpStaticMem *acelp_mem, const int PIT_MAX,
UCHAR *pold_T0_frac = &acelp_mem->old_T0_frac;
if ((int)*pold_T0 >= PIT_MAX) {
- *pold_T0 = (UCHAR)(PIT_MAX - 5);
+ *pold_T0 = (USHORT)(PIT_MAX - 5);
}
*pT0 = (int)*pold_T0;
*pT0_frac = (int)*pold_T0_frac;