commit c5bea960dc69686ec0ce4d0afe62a9e58be9a4cd
author Roger1 Jonsson <roger1.jonsson@sonymobile.com> Tue Apr 11 17:32:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 11 17:32:20 2017 +0000
tree ab9a41fdab784f12254c8ebefb957049d3de0431
parent 12c176066efa2aa3d30998e605689aac2bc615ee
parent 85f575dc67cf269cb42ea6937bbd853f0ef22ae5

Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am: 6dfbcefe4b
am: 85f575dc67

Change-Id: Ie8f3698b61e3f4d13383eaf1f36788186fdf3676

media/libstagefright/SampleTable.cpp

diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp
index 6423956..5145819 100644
--- a/media/libstagefright/SampleTable.cpp
+++ b/media/libstagefright/SampleTable.cpp
@@ -554,6 +554,10 @@
     }
 
     for (size_t i = 0; i < numSyncSamples; ++i) {
+        if (mSyncSamples[i] == 0) {
+            ALOGE("b/32423862, unexpected zero value in stss");
+            continue;
+        }
         mSyncSamples[i] = ntohl(mSyncSamples[i]) - 1;
     }