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

Commit ce9f217c authored by Paul McLean's avatar Paul McLean
Browse files

Check input parameters to avoid a potential divide-by-zero error. 

Bug: 150156665
Test: build, flash...
Change-Id: I05a5f40acbd18c230decf5b0a8dc0c5d5e690e49
parent 12e5101c

services/audiopolicy/engine/common/src/VolumeCurve.cpp

+17 −3
Original line number Diff line number Diff line
@@ -43,10 +43,24 @@ float VolumeCurve::volIndexToDb(int indexInUi, int volIndexMin, int volIndexMax) 
        indexInUi = volIndexMax;

    }



    // Calculate the new volume index

    size_t nbCurvePoints = mCurvePoints.size();



    int volIdx;

    if (volIndexMin == volIndexMax) {

        if (indexInUi == volIndexMin) {

            volIdx = volIndexMin;

        } else {

            // This would result in a divide-by-zero below

            ALOG_ASSERT(volIndexmin != volIndexMax, "Invalid volume index range & value: 0");

            return NAN;

        }

    } else {

        // interpolaate

        // the volume index in the UI is relative to the min and max volume indices for this stream

        int nbSteps = 1 + mCurvePoints[nbCurvePoints - 1].mIndex - mCurvePoints[0].mIndex;

    int volIdx = (nbSteps * (indexInUi - volIndexMin)) / (volIndexMax - volIndexMin);

        volIdx = (nbSteps * (indexInUi - volIndexMin)) / (volIndexMax - volIndexMin);

    }



    // Where would this volume index been inserted in the curve point

    size_t indexInUiPosition = mCurvePoints.orderOf(CurvePoint(volIdx, 0));