diff options
| author | Wei Jia <wjia@google.com> | 2015-06-04 10:40:23 -0700 |
|---|---|---|
| committer | Wei Jia <wjia@google.com> | 2015-06-04 10:40:23 -0700 |
| commit | a105482ae577852ffd08ce88ae5d1ba81db875ac (patch) | |
| tree | 434cbf9e3f058ab5fced5a78a20a34c27a3b79e8 /media/libstagefright/SampleTable.cpp | |
| parent | 9cf332ca156132931da397bae94b89debb40de10 (diff) | |
| download | frameworks_av-a105482ae577852ffd08ce88ae5d1ba81db875ac.zip frameworks_av-a105482ae577852ffd08ce88ae5d1ba81db875ac.tar.gz frameworks_av-a105482ae577852ffd08ce88ae5d1ba81db875ac.tar.bz2 | |
SampleTable: fix integer overflow checks.
Bug: 20139950
Change-Id: I6f4e3d4c734872074475d9346ed692a4baf77d79
Diffstat (limited to 'media/libstagefright/SampleTable.cpp')
| -rw-r--r-- | media/libstagefright/SampleTable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp index 7f98485..40df34d 100644 --- a/media/libstagefright/SampleTable.cpp +++ b/media/libstagefright/SampleTable.cpp @@ -335,7 +335,7 @@ status_t SampleTable::setTimeToSampleParams( } mTimeToSampleCount = U32_AT(&header[4]); - uint64_t allocSize = mTimeToSampleCount * 2 * (uint64_t)sizeof(uint32_t); + uint64_t allocSize = (uint64_t)mTimeToSampleCount * 2 * sizeof(uint32_t); if (allocSize > SIZE_MAX) { return ERROR_OUT_OF_RANGE; } @@ -383,7 +383,7 @@ status_t SampleTable::setCompositionTimeToSampleParams( } mNumCompositionTimeDeltaEntries = numEntries; - uint64_t allocSize = numEntries * 2 * (uint64_t)sizeof(uint32_t); + uint64_t allocSize = (uint64_t)numEntries * 2 * sizeof(uint32_t); if (allocSize > SIZE_MAX) { return ERROR_OUT_OF_RANGE; } |