commit 057c5d3abaac187169e2e735e768787fadee1bf6
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 04 22:58:14 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 04 22:58:14 2020 +0000
tree d3d2dd7a609feaf71dac614f7e3fd17d69e235c1
parent 4817c71fb1008bc4d57b7f6691868b1fb117a047
parent fe5cd492bf9895da4def021eb915847dbb9d1c90

Fix native exception caused by memset 0 to NULL pointer am: fe5cd492bf

Change-Id: Idbcfc51557acb403bcae1bacf68bf2ee85dc77cd

media/extractors/mp4/SampleTable.cpp

diff --git a/media/extractors/mp4/SampleTable.cpp b/media/extractors/mp4/SampleTable.cpp
index 9dddf2c..a4d3994 100644
--- a/media/extractors/mp4/SampleTable.cpp
+++ b/media/extractors/mp4/SampleTable.cpp
@@ -655,12 +655,13 @@
     }
 
     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;