fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

am b3c5a4bb: Fix crash on invalid channel config 

* commit 'b3c5a4bb8442ab3158fa1f52b790fadc64546f46':
  Fix crash on invalid channel config
This commit is contained in:
Marco Nelissen 2015-09-15 01:10:04 +00:00 committed by Android Git Automerger
parent 267940f5bd b3c5a4bb84
commit 9f42dfb799
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libPCMutils/src/pcmutils_lib.cpp
View File

@ -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 (
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) {