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

Commit 8cb9d016 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Fix native exception caused by memset 0 to NULL pointer am: fe5cd492 am: 057c5d3a 

Change-Id: I88a335db27fec0ea5cbc7d9af96539d0add2e674
parents 04e4465a 057c5d3a

media/extractors/mp4/SampleTable.cpp

+2 −1
Original line number Diff line number Diff line
@@ -652,12 +652,13 @@ void SampleTable::buildSampleEntriesTable() { 
    }



    mSampleTimeEntries = new (std::nothrow) SampleTimeEntry[mNumSampleSizes];

    memset(mSampleTimeEntries, 0, sizeof(SampleTimeEntry) * mNumSampleSizes);



    if (!mSampleTimeEntries) {

        ALOGE("Cannot allocate sample entry table with %llu entries.",

                (unsigned long long)mNumSampleSizes);

        return;

    }

    memset(mSampleTimeEntries, 0, sizeof(SampleTimeEntry) * mNumSampleSizes);



    uint32_t sampleIndex = 0;

    uint64_t sampleTime = 0;