From 5578af3e988193aae89a2f990f930ae756c34785 Mon Sep 17 00:00:00 2001 From: Roger I Nilsson Date: Wed, 10 Jun 2015 14:42:39 +0200 Subject: Remove possible div by zero in WavExtractor Do not accept 0 channels as a valid wav format. Change-Id: I8d03d68f58d023b039503732736cc3a82ea560eb --- media/libstagefright/WAVExtractor.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'media/libstagefright/WAVExtractor.cpp') diff --git a/media/libstagefright/WAVExtractor.cpp b/media/libstagefright/WAVExtractor.cpp index d86dffb..b988f19 100644 --- a/media/libstagefright/WAVExtractor.cpp +++ b/media/libstagefright/WAVExtractor.cpp @@ -195,12 +195,14 @@ status_t WAVExtractor::init() { 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; } } -- cgit v1.1