From b3c5a4bb8442ab3158fa1f52b790fadc64546f46 Mon Sep 17 00:00:00 2001 From: Marco Nelissen Date: Tue, 8 Sep 2015 08:48:41 -0700 Subject: Fix crash on invalid channel config Bug: 23876444 Change-Id: I90ad197811ebabceb5b5d74d6d3f20716fbe2d45 --- libPCMutils/src/pcmutils_lib.cpp | 7 +++++-- 1 file 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 #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) { -- cgit v1.2.3