generic-library/fdk-aac
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix stack corruption happening in aacDecoder_drcExtractAndMap() am: a06d1c2 am: 47739cd

Browse Source 
am: 118fc75

* commit '118fc75eee6cc763a3105d6e963b77d76d114a2e':
  Fix stack corruption happening in aacDecoder_drcExtractAndMap()
This commit is contained in:
Jean-Michel Trivi 2016-03-22 02:49:48 +00:00 committed by android-build-merger
commit 7657556633
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libAACdec/src/aacdec_drc.cpp
View File

@ -2,7 +2,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 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. © Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
All rights reserved. All rights reserved.
1. INTRODUCTION 1. INTRODUCTION
@ -705,6 +705,10 @@ static int aacDecoder_drcExtractAndMap (
} }
self->numPayloads = 0; self->numPayloads = 0;
if (self->numThreads >= MAX_DRC_THREADS) {
self->numThreads = MAX_DRC_THREADS - 1;
}
if (self->dvbAncDataAvailable) if (self->dvbAncDataAvailable)
{ /* Append a DVB heavy compression payload thread if available. */ { /* Append a DVB heavy compression payload thread if available. */
int bitsParsed; int bitsParsed;
@ -731,6 +735,10 @@ static int aacDecoder_drcExtractAndMap (
/* coupling channels not supported */ /* coupling channels not supported */
if (self->numThreads >= MAX_DRC_THREADS) {
self->numThreads = MAX_DRC_THREADS - 1;
}
/* check for valid threads */ /* check for valid threads */
for (thread = 0; thread < self->numThreads; thread++) { for (thread = 0; thread < self->numThreads; thread++) {
CDrcPayload *pThreadBs = &threadBs[thread]; CDrcPayload *pThreadBs = &threadBs[thread];