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

Commit 89a50551 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 

am: 77a5123b

Change-Id: Id75e62379acbce548ee099abb3134e6c964a9939
parents 395d1a36 77a5123b

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;

        }