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

Commit 738a753a authored by Wei Jia's avatar Wei Jia Committed by Nick Kralevich
Browse files

SampleTable: fix integer overflow checks. 

Bug: 20139950
Bug: 22935234
(cherry picked from commit a105482a)

Change-Id: I408d261de1a6dd5c4343bcf3a7dfd8a259e0e2f3
parent 4dd7cb69

media/libstagefright/SampleTable.cpp

+2 −2
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ status_t SampleTable::setTimeToSampleParams( 
    }



    mTimeToSampleCount = U32_AT(&header[4]);

    uint64_t allocSize = mTimeToSampleCount * 2 * (uint64_t)sizeof(uint32_t);

    uint64_t allocSize = (uint64_t)mTimeToSampleCount * 2 * sizeof(uint32_t);

    if (allocSize > SIZE_MAX) {

        return ERROR_OUT_OF_RANGE;

    }
@@ -379,7 +379,7 @@ status_t SampleTable::setCompositionTimeToSampleParams( 
    }



    mNumCompositionTimeDeltaEntries = numEntries;

    uint64_t allocSize = numEntries * 2 * (uint64_t)sizeof(uint32_t);

    uint64_t allocSize = (uint64_t)numEntries * 2 * sizeof(uint32_t);

    if (allocSize > SIZE_MAX) {

        return ERROR_OUT_OF_RANGE;

    }