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

Commit ae2d8ccc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into cw-f-dev 

* changes:
  [automerger] Fix 'potential memory leak' compiler warning. am: 37c428cd am: 2298edf5 am: 56b9616e
  [automerger] Fix 'potential memory leak' compiler warning. am: 37c428cd am: 2298edf5
  [automerger] Fix 'potential memory leak' compiler warning. am: 37c428cd
  Fix 'potential memory leak' compiler warning.
parents 28129f76 4c506ef8

media/libstagefright/SampleTable.cpp

+1 −2
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ status_t SampleTable::setSyncSampleParams(off64_t data_offset, size_t data_size) 


    if (mDataSource->readAt(data_offset + 8, mSyncSamples,

            (size_t)allocSize) != (ssize_t)allocSize) {

        delete mSyncSamples;

        delete[] mSyncSamples;

        mSyncSamples = NULL;

        return ERROR_IO;

    }
@@ -987,4 +987,3 @@ int32_t SampleTable::getCompositionTimeOffset(uint32_t sampleIndex) { 
}



}  // namespace android