Skip to content

F
fdk-aac
Commit 106fb85b authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files
Options

am 9f42dfb7: am b3c5a4bb: Fix crash on invalid channel config 

* commit '9f42dfb7':
  Fix crash on invalid channel config
parents 8e8d9207 9f42dfb7
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
libPCMutils/src/pcmutils_lib.cpp
View file @ 106fb85b
...@@ -88,7 +88,7 @@ amm-info@iis.fraunhofer.de ...@@ -88,7 +88,7 @@ amm-info@iis.fraunhofer.de
expansion in the PCM time domain. expansion in the PCM time domain.
*******************************************************************************/ *******************************************************************************/
#include <log/log.h>
#include "pcmutils_lib.h" #include "pcmutils_lib.h"
#include "genericStds.h" #include "genericStds.h"
...@@ -2073,7 +2073,10 @@ PCMDMX_ERROR pcmDmx_ApplyFrame ( ...@@ -2073,7 +2073,10 @@ PCMDMX_ERROR pcmDmx_ApplyFrame (
map[ch++] = inCh; map[ch++] = inCh;
} }
} }
FDK_ASSERT(ch == numInChannels); if (ch != numInChannels) {
ALOGE("b/23876444");
return PCMDMX_INVALID_ARGUMENT;
}
/* Remove unused cols from factor matrix */ /* Remove unused cols from factor matrix */
for (inCh=0; inCh < numInChannels; inCh+=1) { for (inCh=0; inCh < numInChannels; inCh+=1) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment