commit 0a62162accbce87db829869a15eab72eca2607b2
author Jean-Michel Trivi <jmtrivi@google.com> Fri Dec 04 17:17:03 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 04 17:17:03 2015 +0000
tree 54f8fcc88b07a659a4e4da26c937bd779a13c728
parent b6c63ca64d521beb489e4464ce351fd7d3360d19
parent e6b4530d758f411907ce737b7475c7dc22551a78

Merge "Validation of Number of Channels on WAV files." am: 8ec6ab3bfa am: bc6d05bac1
am: e6b4530d75

* commit 'e6b4530d758f411907ce737b7475c7dc22551a78':
  Validation of Number of Channels on WAV files.

media/libstagefright/WAVExtractor.cpp

diff --git a/media/libstagefright/WAVExtractor.cpp b/media/libstagefright/WAVExtractor.cpp
index 4203dae..680c0c6 100644
--- a/media/libstagefright/WAVExtractor.cpp
+++ b/media/libstagefright/WAVExtractor.cpp
@@ -193,17 +193,17 @@
             }
 
             mNumChannels = U16_LE_AT(&formatSpec[2]);
+
+            if (mNumChannels < 1 || mNumChannels > 8) {
+                ALOGE("Unsupported number of channels (%d)", mNumChannels);
+                return ERROR_UNSUPPORTED;
+            }
+
             if (mWaveFormat != WAVE_FORMAT_EXTENSIBLE) {
-                if (mNumChannels == 0) {
-                    return ERROR_UNSUPPORTED;
-                } else if (mNumChannels != 1 && mNumChannels != 2) {
+                if (mNumChannels != 1 && mNumChannels != 2) {
                     ALOGW("More than 2 channels (%d) in non-WAVE_EXT, unknown channel mask",
                             mNumChannels);
                 }
-            } else {
-                if (mNumChannels < 1 || mNumChannels > 8) {
-                    return ERROR_UNSUPPORTED;
-                }
             }
 
             mSampleRate = U32_LE_AT(&formatSpec[4]);