commit ce92aba3ab05f7d653908acc7e9be73128dd5ccd
author Marco Nelissen <marcone@google.com> Tue Oct 27 21:32:14 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 27 21:32:14 2015 +0000
tree 0cf00b0e91a087e9d8bf684d797d035b28ee8220
parent 6360955a0b34e7c48d9471c766ba6d5ca0051d97
parent b8e13b1b1a7749e54641efbef32d5cf49933cba2

Merge "Remove possible div by zero in WavExtractor" am: acd2186aa2
am: b8e13b1b1a

* commit 'b8e13b1b1a7749e54641efbef32d5cf49933cba2':
  Remove possible div by zero in WavExtractor

media/libstagefright/WAVExtractor.cpp

diff --git a/media/libstagefright/WAVExtractor.cpp b/media/libstagefright/WAVExtractor.cpp
index 48b810a..51d639d 100644
--- a/media/libstagefright/WAVExtractor.cpp
+++ b/media/libstagefright/WAVExtractor.cpp
@@ -194,12 +194,14 @@
 
             mNumChannels = U16_LE_AT(&formatSpec[2]);
             if (mWaveFormat != WAVE_FORMAT_EXTENSIBLE) {
-                if (mNumChannels != 1 && mNumChannels != 2) {
+                if (mNumChannels == 0) {
+                    return ERROR_UNSUPPORTED;
+                } else 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) {
+                if (mNumChannels < 1 || mNumChannels > 8) {
                     return ERROR_UNSUPPORTED;
                 }
             }