Fix stack buffer overflow in Pred_lt4().

Bug: 186706541
Bug: 160187491
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: I3b8d9326319cca21145cc246588b01c5bf29a9a0
This commit is contained in:
Fraunhofer IIS FDK 2020-07-06 16:39:15 +02:00 committed by Jean-Michel Trivi
parent 5a83a8e5e1
commit 22e70729b4
1 changed files with 2 additions and 2 deletions

View File

@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android 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. Forschung e.V. All rights reserved.
1. INTRODUCTION 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; UCHAR *pold_T0_frac = &acelp_mem->old_T0_frac;
if ((int)*pold_T0 >= PIT_MAX) { if ((int)*pold_T0 >= PIT_MAX) {
*pold_T0 = (UCHAR)(PIT_MAX - 5); *pold_T0 = (USHORT)(PIT_MAX - 5);
} }
*pT0 = (int)*pold_T0; *pT0 = (int)*pold_T0;
*pT0_frac = (int)*pold_T0_frac; *pT0_frac = (int)*pold_T0_frac;