commit 24aeeef298ec943fbabe9f1a0771052fc8dbdbee
author Roger1 Jonsson <roger1.jonsson@sonymobile.com> Tue Apr 11 18:03:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 11 18:03:54 2017 +0000
tree 957954994844b41342c8e0f1e8ec29c09f345593
parent e745b0f6c1ebc2de78f8e1667f7d54b7293036bf
parent f0a54b35c67b11d994783b82b886ceb8ac496532

Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am: 6dfbcefe4b am: 85f575dc67 am: c5bea960dc am: c510b7fb9b am: 2f72b15892 am: 4f383edd27 am: 9d31e50055 am: 2046d33198
am: f0a54b35c6

Change-Id: I12e012cdfa97ba91a256e41412185bc1276be522

media/libstagefright/SampleTable.cpp

diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp
index 161ddfc..ee5fdf0 100644
--- a/media/libstagefright/SampleTable.cpp
+++ b/media/libstagefright/SampleTable.cpp
@@ -567,6 +567,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;
     }