diff options
| author | Joshua J. Drake <android-open-source@qoop.org> | 2015-08-04 02:41:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-04 02:41:32 +0000 |
| commit | 8ef5da3ddddd1bb4356d9cc6df4d52ad8afc4459 (patch) | |
| tree | bf8e1f8287d7b4bb307885c613f7c45520054156 /media | |
| parent | f354c48e386d1405d67882c382e26e3e4598e797 (diff) | |
| parent | 4dd7cb699f49b56f94a32080fdac7f0ec8237ff4 (diff) | |
| download | frameworks_av-8ef5da3ddddd1bb4356d9cc6df4d52ad8afc4459.zip frameworks_av-8ef5da3ddddd1bb4356d9cc6df4d52ad8afc4459.tar.gz frameworks_av-8ef5da3ddddd1bb4356d9cc6df4d52ad8afc4459.tar.bz2 | |
am 4dd7cb69: Fix integer underflow in ESDS processing
* commit '4dd7cb699f49b56f94a32080fdac7f0ec8237ff4':
Fix integer underflow in ESDS processing
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/ESDS.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/media/libstagefright/ESDS.cpp b/media/libstagefright/ESDS.cpp index 4a0c35c..c76bc4a 100644 --- a/media/libstagefright/ESDS.cpp +++ b/media/libstagefright/ESDS.cpp @@ -136,6 +136,8 @@ status_t ESDS::parseESDescriptor(size_t offset, size_t size) { --size; if (streamDependenceFlag) { + if (size < 2) + return ERROR_MALFORMED; offset += 2; size -= 2; } @@ -145,11 +147,15 @@ status_t ESDS::parseESDescriptor(size_t offset, size_t size) { return ERROR_MALFORMED; } unsigned URLlength = mData[offset]; + if (URLlength >= size) + return ERROR_MALFORMED; offset += URLlength + 1; size -= URLlength + 1; } if (OCRstreamFlag) { + if (size < 2) + return ERROR_MALFORMED; offset += 2; size -= 2; |