diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2016-03-22 02:49:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-22 02:49:48 +0000 |
| commit | 7657556633262752ad2db9e3914a04128bd64e1b (patch) | |
| tree | 1890fa95db14a23bc83aea6eec77568e3f4ff661 | |
| parent | 2d435aa43323935bd8ed293f4f12cddfdee81eb3 (diff) | |
| parent | 118fc75eee6cc763a3105d6e963b77d76d114a2e (diff) | |
| download | fdk-aac-7657556633262752ad2db9e3914a04128bd64e1b.tar.gz fdk-aac-7657556633262752ad2db9e3914a04128bd64e1b.tar.bz2 fdk-aac-7657556633262752ad2db9e3914a04128bd64e1b.zip | |
Fix stack corruption happening in aacDecoder_drcExtractAndMap() am: a06d1c2 am: 47739cd
am: 118fc75
* commit '118fc75eee6cc763a3105d6e963b77d76d114a2e':
Fix stack corruption happening in aacDecoder_drcExtractAndMap()
| -rw-r--r-- | libAACdec/src/aacdec_drc.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libAACdec/src/aacdec_drc.cpp b/libAACdec/src/aacdec_drc.cpp index 0c33a2b..9cfc5d5 100644 --- a/libAACdec/src/aacdec_drc.cpp +++ b/libAACdec/src/aacdec_drc.cpp @@ -2,7 +2,7 @@ /* ----------------------------------------------------------------------------------------------------------- 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. 1. INTRODUCTION @@ -705,6 +705,10 @@ static int aacDecoder_drcExtractAndMap ( } self->numPayloads = 0; + if (self->numThreads >= MAX_DRC_THREADS) { + self->numThreads = MAX_DRC_THREADS - 1; + } + if (self->dvbAncDataAvailable) { /* Append a DVB heavy compression payload thread if available. */ int bitsParsed; @@ -731,6 +735,10 @@ static int aacDecoder_drcExtractAndMap ( /* coupling channels not supported */ + if (self->numThreads >= MAX_DRC_THREADS) { + self->numThreads = MAX_DRC_THREADS - 1; + } + /* check for valid threads */ for (thread = 0; thread < self->numThreads; thread++) { CDrcPayload *pThreadBs = &threadBs[thread]; |