commit b2fea5abc747d3c89075e565ede80bfb36335aa2
author Marco Nelissen <marcone@google.com> Tue Sep 08 08:48:41 2015 -0700
committer The Android Automerger <android-build@google.com> Wed Oct 21 11:59:41 2015 -0700
tree dd29760980bc0637ce09b4c2a3f657125b793c8b
parent 6792cf6361ff339e336287affb0bfe54bf6957a9

Fix crash on invalid channel config

Bug: 23876444
Change-Id: I90ad197811ebabceb5b5d74d6d3f20716fbe2d45

libPCMutils/src/pcmutils_lib.cpp

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 @@
                 expansion in the PCM time domain.
 
 *******************************************************************************/
-
+#include <log/log.h>
 #include "pcmutils_lib.h"
 
 #include "genericStds.h"
@@ -2073,7 +2073,10 @@
           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) {