diff options
| author | Joshua J. Drake <android-open-source@qoop.org> | 2015-08-04 02:56:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-04 02:56:01 +0000 |
| commit | 2e24d0911ee585cbd447efe6150bafaaf8f9ef66 (patch) | |
| tree | 098704ec5cebd558c9da675bea7333cfe6f7047e /media | |
| parent | 272f4056162e119db61fb304b01f0152c07b8e02 (diff) | |
| parent | a59d5e6692d0b0dc0924144f596d09e7dd2b193c (diff) | |
| download | frameworks_av-2e24d0911ee585cbd447efe6150bafaaf8f9ef66.zip frameworks_av-2e24d0911ee585cbd447efe6150bafaaf8f9ef66.tar.gz frameworks_av-2e24d0911ee585cbd447efe6150bafaaf8f9ef66.tar.bz2 | |
am a59d5e66: am 8ef5da3d: am 4dd7cb69: Fix integer underflow in ESDS processing
* commit 'a59d5e6692d0b0dc0924144f596d09e7dd2b193c':
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; |