commit d12204372f04b80b0ccbf6f02473aef01afaaefc
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 11 17:02:45 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 11 17:02:46 2017 +0000
tree f187e47fc5290f4a9e22163cbe59b60ce14f5fa5
parent 82ffcbd6671a96421cdd960eb983319e3b2f1b80
parent 024e783acdff65cdb8eb9de5ade3359ebb338a3b

Merge "Avoid crash for stss sync sample number 0" into lmp-dev

media/libstagefright/SampleTable.cpp

diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp
index 450e288..5b9aef1 100644
--- a/media/libstagefright/SampleTable.cpp
+++ b/media/libstagefright/SampleTable.cpp
@@ -552,6 +552,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;
     }