summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2015-04-11 00:05:20 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-11 00:05:20 +0000
commit14c686c0f6eb3e9ac5774bbfa7b5f2fa4e04ce80 (patch)
tree371ad6159b619a5dd91c7abab6ca70734f91c56c /media/libstagefright
parent3cff43241858431ab1e209012dcdcdee0e34c364 (diff)
parent940189d991f9f7eb55d8a379cf6fda6ec486ceb5 (diff)
downloadframeworks_av-14c686c0f6eb3e9ac5774bbfa7b5f2fa4e04ce80.zip
frameworks_av-14c686c0f6eb3e9ac5774bbfa7b5f2fa4e04ce80.tar.gz
frameworks_av-14c686c0f6eb3e9ac5774bbfa7b5f2fa4e04ce80.tar.bz2
am 940189d9: am 475de998: am 47759307: am 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into klp-dev
* commit '940189d991f9f7eb55d8a379cf6fda6ec486ceb5': Fix integer overflow during MP4 atom processing
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/SampleTable.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp
index b572af3..6030236 100644
--- a/media/libstagefright/SampleTable.cpp
+++ b/media/libstagefright/SampleTable.cpp
@@ -230,6 +230,9 @@ status_t SampleTable::setSampleToChunkParams(
return ERROR_MALFORMED;
}
+ if (SIZE_MAX / sizeof(SampleToChunkEntry) <= mNumSampleToChunkOffsets)
+ return ERROR_OUT_OF_RANGE;
+
mSampleToChunkEntries =
new SampleToChunkEntry[mNumSampleToChunkOffsets];