commit 9fe846e4ff3df00b5d46766555e124040d01f939
author Roger I Nilsson <roger2.nilsson@sonymobile.com> Wed Jun 10 14:42:39 2015 +0200
committer Takahiro Aizawa <takahiro.aizawa@sonymobile.com> Fri Oct 23 21:04:45 2015 +0900
tree a84e1292ff2277efd62ede37be06cf94edb0c6e8
parent 2d772fd4afd1481a8cea5f59b890d771dbada2f6

Remove possible div by zero in WavExtractor

Do not accept 0 channels as a valid wav format.

Change-Id: I8d03d68f58d023b039503732736cc3a82ea560eb

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;
                 }
             }