diff options
| author | Wei Jia <wjia@google.com> | 2015-08-14 14:45:32 -0700 |
|---|---|---|
| committer | Wei Jia <wjia@google.com> | 2015-08-17 13:08:17 -0700 |
| commit | 2c5fb0c7249ba7e5d79236c61a1c94a489041e65 (patch) | |
| tree | 68a343d132f5be025e3c39065d0fb9a443da7cdd /media/libstagefright/SampleTable.cpp | |
| parent | fa8ebb45fd850f56ca1bf64fbed3ac11e10c7d3d (diff) | |
| download | frameworks_av-2c5fb0c7249ba7e5d79236c61a1c94a489041e65.zip frameworks_av-2c5fb0c7249ba7e5d79236c61a1c94a489041e65.tar.gz frameworks_av-2c5fb0c7249ba7e5d79236c61a1c94a489041e65.tar.bz2 | |
libstagefright: fix possible overflow in SampleTable.cpp
Bug: 23197952
Change-Id: I83afe5aad74a41102b127c4e46799ebc317cd96c
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 40df34d..aeef99f 100644 --- a/media/libstagefright/SampleTable.cpp +++ b/media/libstagefright/SampleTable.cpp @@ -336,7 +336,7 @@ status_t SampleTable::setTimeToSampleParams( mTimeToSampleCount = U32_AT(&header[4]); uint64_t allocSize = (uint64_t)mTimeToSampleCount * 2 * sizeof(uint32_t); - if (allocSize > SIZE_MAX) { + if (allocSize > UINT32_MAX) { return ERROR_OUT_OF_RANGE; } mTimeToSample = new (std::nothrow) uint32_t[mTimeToSampleCount * 2]; @@ -384,7 +384,7 @@ status_t SampleTable::setCompositionTimeToSampleParams( mNumCompositionTimeDeltaEntries = numEntries; uint64_t allocSize = (uint64_t)numEntries * 2 * sizeof(uint32_t); - if (allocSize > SIZE_MAX) { + if (allocSize > UINT32_MAX) { return ERROR_OUT_OF_RANGE; } |