commit 146427dcdad5c3b23d9ab1a5a6416551f1f110af
author Marco Nelissen <marcone@google.com> Tue Oct 27 21:39:30 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 27 21:39:30 2015 +0000
tree 66381f39f2dcd4855039c9be680264043a697c62
parent f22f6d5bc460caa01b4288ea0cc6d7d602d34bae
parent ce92aba3ab05f7d653908acc7e9be73128dd5ccd

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

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

media/libstagefright/WAVExtractor.cpp

diff --git a/media/libstagefright/WAVExtractor.cpp b/media/libstagefright/WAVExtractor.cpp
index b30376d..51d639d 100644
--- a/media/libstagefright/WAVExtractor.cpp
+++ b/media/libstagefright/WAVExtractor.cpp
@@ -194,7 +194,9 @@
 
             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);
                 }