diff options
| author | Marco Nelissen <marcone@google.com> | 2015-09-08 08:48:41 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2015-09-28 16:24:41 -0700 |
| commit | 6ae3a48d6e5ac5963e9f063ef932c128ec8bd2ca (patch) | |
| tree | dd29760980bc0637ce09b4c2a3f657125b793c8b | |
| parent | 6792cf6361ff339e336287affb0bfe54bf6957a9 (diff) | |
| download | android_external_aac-cm-12.1.tar.gz android_external_aac-cm-12.1.tar.bz2 android_external_aac-cm-12.1.zip | |
Fix crash on invalid channel configstable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pcm-12.1
Bug: 23876444
Change-Id: I90ad197811ebabceb5b5d74d6d3f20716fbe2d45
| -rw-r--r-- | libPCMutils/src/pcmutils_lib.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libPCMutils/src/pcmutils_lib.cpp b/libPCMutils/src/pcmutils_lib.cpp index 32d8437..cd22171 100644 --- a/libPCMutils/src/pcmutils_lib.cpp +++ b/libPCMutils/src/pcmutils_lib.cpp @@ -88,7 +88,7 @@ amm-info@iis.fraunhofer.de expansion in the PCM time domain. *******************************************************************************/ - +#include <log/log.h> #include "pcmutils_lib.h" #include "genericStds.h" @@ -2073,7 +2073,10 @@ PCMDMX_ERROR pcmDmx_ApplyFrame ( map[ch++] = inCh; } } - FDK_ASSERT(ch == numInChannels); + if (ch != numInChannels) { + ALOGE("b/23876444"); + return PCMDMX_INVALID_ARGUMENT; + } /* Remove unused cols from factor matrix */ for (inCh=0; inCh < numInChannels; inCh+=1) { |