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

* commit '9f42dfb7': Fix crash on invalid channel config

am 9f42dfb7: am b3c5a4bb: Fix crash on invalid channel config
* commit '9f42dfb7': Fix crash on invalid channel config
106fb85b · Marco Nelissen · Android Git Automerger · 8e8d9207 · 9f42dfb7 · 106fb85b
Commit 106fb85b authored Sep 15, 2015 by Marco Nelissen Committed by Android Git Automerger Sep 15, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

libPCMutils/src/pcmutils_lib.cpp libPCMutils/src/pcmutils_lib.cpp +5 -2

No files found.
--- 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) {