summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/SampleTable.cpp
diff options
context:
space:
mode:
authorDan Austin <danielaustin@google.com>2015-10-16 15:54:52 -0700
committerSteve Kondik <steve@cyngn.com>2015-11-05 21:16:19 -0800
commita31baec24f1fed008e0849cf25e8c62d80d01cf8 (patch)
treea3e67ff68e80bff1bc9b83dc48587676b96ebf81 /media/libstagefright/SampleTable.cpp
parenta2d1b3c8b6cbb48e68728783471cfa2c7b75271c (diff)
downloadframeworks_av-a31baec24f1fed008e0849cf25e8c62d80d01cf8.zip
frameworks_av-a31baec24f1fed008e0849cf25e8c62d80d01cf8.tar.gz
frameworks_av-a31baec24f1fed008e0849cf25e8c62d80d01cf8.tar.bz2
Fixed comparison so that both operands are treated as 64 bit.
Fixed comparison in setSampleToChunkParams so that both operands are treated as 64-bit to address build breakage. Change-Id: I4b2bc52e9fc61b7e00898928a09e134e88b179f9
Diffstat (limited to 'media/libstagefright/SampleTable.cpp')
-rw-r--r--media/libstagefright/SampleTable.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp
index ff2c52e..02b20c4 100644
--- a/media/libstagefright/SampleTable.cpp
+++ b/media/libstagefright/SampleTable.cpp
@@ -246,7 +246,7 @@ status_t SampleTable::setSampleToChunkParams(
for (uint32_t i = 0; i < mNumSampleToChunkOffsets; ++i) {
uint8_t buffer[12];
- if (((SIZE_MAX / 12) - 8 - i) < mSampleToChunkOffset) {
+ if ((off64_t)((SIZE_MAX / 12) - 8 - i) < mSampleToChunkOffset) {
return ERROR_MALFORMED;
}