diff options
| author | Nick Kralevich <nnk@google.com> | 2015-04-10 23:34:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-10 23:34:59 +0000 |
| commit | b919a3a3d38c4b1cbb378c38cc6154a81ebe01c7 (patch) | |
| tree | c8f5ca626be607a8235259665ad78749917b64c7 /media | |
| parent | 4775930799bd9a9fbad8efe5d338e890dd7444ed (diff) | |
| parent | 6429079345404932c5be5956efc7154390d2ed0e (diff) | |
| download | frameworks_av-b919a3a3d38c4b1cbb378c38cc6154a81ebe01c7.zip frameworks_av-b919a3a3d38c4b1cbb378c38cc6154a81ebe01c7.tar.gz frameworks_av-b919a3a3d38c4b1cbb378c38cc6154a81ebe01c7.tar.bz2 | |
am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-dev
* commit '6429079345404932c5be5956efc7154390d2ed0e':
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; |