commit f903306aeb7ea2b0ab5d50437fdcb2b819a8f99e
author Marco Nelissen <marcone@google.com> Mon Mar 21 19:28:22 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 21 19:28:22 2016 +0000
tree 88f8b943f95bceed901de324fed8d2e4ae096e1f
parent 3c0d59dd4397d57352416af05fde596dcc78179a
parent 1cb23b033987e86827a4fa96550c6a3670b688f1

Merge "Fix 64-bit comparison"

media/libstagefright/SampleTable.cpp

diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp
index 93cf055..2f69fd8 100644
--- a/media/libstagefright/SampleTable.cpp
+++ b/media/libstagefright/SampleTable.cpp
@@ -209,6 +209,11 @@
 status_t SampleTable::setSampleToChunkParams(
         off64_t data_offset, size_t data_size) {
     if (mSampleToChunkOffset >= 0) {
+        // already set
+        return ERROR_MALFORMED;
+    }
+
+    if (data_offset < 0) {
         return ERROR_MALFORMED;
     }
 
@@ -246,7 +251,7 @@
     for (uint32_t i = 0; i < mNumSampleToChunkOffsets; ++i) {
         uint8_t buffer[12];
 
-        if ((off64_t)(SIZE_MAX - 8 - (i * 12)) < mSampleToChunkOffset) {
+        if ((SIZE_MAX - 8 - (i * 12)) < (size_t)mSampleToChunkOffset) {
             return ERROR_MALFORMED;
         }