Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8e13b1b authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Remove possible div by zero in WavExtractor" 

am: acd2186a

* commit 'acd2186a':
  Remove possible div by zero in WavExtractor
parents 6b72f15d acd2186a

media/libstagefright/WAVExtractor.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -194,12 +194,14 @@ status_t WAVExtractor::init() { 




            mNumChannels = U16_LE_AT(&formatSpec[2]);

            mNumChannels = U16_LE_AT(&formatSpec[2]);

            if (mWaveFormat != WAVE_FORMAT_EXTENSIBLE) {

            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",

                    ALOGW("More than 2 channels (%d) in non-WAVE_EXT, unknown channel mask",

                            mNumChannels);

                            mNumChannels);

                }

                }

            } else {

            } else {

                if (mNumChannels < 1 && mNumChannels > 8) {

                if (mNumChannels < 1 || mNumChannels > 8) {

                    return ERROR_UNSUPPORTED;

                    return ERROR_UNSUPPORTED;

                }

                }

            }

            }