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

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

Merge "Fix divide by zero" am: 659cb35e am: 021add2d 

am: 6fe7d597

Change-Id: I05b15bf43fb31d9de3560ca1ccfe0c93f29fcf8f
parents 4bc99bcd 6fe7d597

media/libstagefright/SampleIterator.cpp

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ status_t SampleIterator::findSampleTimeAndDuration( 
            break;

        }

        if (mTimeToSampleIndex == mTable->mTimeToSampleCount ||

            mTTSCount > UINT32_MAX / mTTSDuration ||

            (mTTSDuration != 0 && mTTSCount > UINT32_MAX / mTTSDuration) ||

            mTTSSampleTime > UINT32_MAX - (mTTSCount * mTTSDuration)) {

            return ERROR_OUT_OF_RANGE;

        }