diff options
| author | Marco Nelissen <marcone@google.com> | 2015-11-10 09:06:02 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-29 22:45:24 -0800 |
| commit | efc362f8ff71c2b8397951c021737a1ef3211446 (patch) | |
| tree | e0caa716a4f7d15b1877725e9dc367d8c07ce37a /media/libstagefright/SampleTable.cpp | |
| parent | c85eb5757f55a1a0bb4737971335d410733c5d05 (diff) | |
| download | frameworks_av-efc362f8ff71c2b8397951c021737a1ef3211446.zip frameworks_av-efc362f8ff71c2b8397951c021737a1ef3211446.tar.gz frameworks_av-efc362f8ff71c2b8397951c021737a1ef3211446.tar.bz2 | |
Fix overflow check so it doesn't reject legitimate files
Change-Id: Id2a25af287f2d06755ebdf133fcea166a6767a27
Diffstat (limited to 'media/libstagefright/SampleTable.cpp')
| -rw-r--r-- | media/libstagefright/SampleTable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp index 02b20c4..93cf055 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 ((off64_t)((SIZE_MAX / 12) - 8 - i) < mSampleToChunkOffset) { + if ((off64_t)(SIZE_MAX - 8 - (i * 12)) < mSampleToChunkOffset) { return ERROR_MALFORMED; } |