diff options
| author | Marco Nelissen <marcone@google.com> | 2015-09-15 02:12:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-15 02:12:36 +0000 |
| commit | 106fb85b42000d085329fbd6bb6cc1d2ac47317d (patch) | |
| tree | d7fe3a5b926fb435fb4e83eba0c6dc2d05e5ee1a | |
| parent | 8e8d92070887105d686f67f0a049c9cdefb8a919 (diff) | |
| parent | 9f42dfb7990a107da23454669459bb5e28d90726 (diff) | |
| download | fdk-aac-106fb85b42000d085329fbd6bb6cc1d2ac47317d.tar.gz fdk-aac-106fb85b42000d085329fbd6bb6cc1d2ac47317d.tar.bz2 fdk-aac-106fb85b42000d085329fbd6bb6cc1d2ac47317d.zip | |
am 9f42dfb7: am b3c5a4bb: Fix crash on invalid channel config
* commit '9f42dfb7990a107da23454669459bb5e28d90726':
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) { |