diff options
| author | Marco Nelissen <marcone@google.com> | 2015-09-15 01:10:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-15 01:10:04 +0000 |
| commit | 9f42dfb7990a107da23454669459bb5e28d90726 (patch) | |
| tree | a2df54efd44c83554fef14e86bd953ebb7986f22 | |
| parent | 267940f5bd089940840f1dcdc744e10dbd8df254 (diff) | |
| parent | b3c5a4bb8442ab3158fa1f52b790fadc64546f46 (diff) | |
| download | android_external_aac-9f42dfb7990a107da23454669459bb5e28d90726.tar.gz android_external_aac-9f42dfb7990a107da23454669459bb5e28d90726.tar.bz2 android_external_aac-9f42dfb7990a107da23454669459bb5e28d90726.zip | |
am b3c5a4bb: Fix crash on invalid channel configandroid-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11
* commit 'b3c5a4bb8442ab3158fa1f52b790fadc64546f46':
Fix crash on invalid channel config
| -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) { |