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

Commit acd2186a authored by Marco Nelissen's avatar Marco Nelissen Committed by Gerrit Code Review
Browse files

Merge "Remove possible div by zero in WavExtractor"

parents 58fdf7cc 9fe846e4

media/libstagefright/WAVExtractor.cpp

+4 −2
Original line number Diff line number Diff line
@@ -194,12 +194,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;

                }

            }