diff options
| author | Robert Shih <robertshih@google.com> | 2015-04-30 18:39:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-30 18:40:00 +0000 |
| commit | 1471e7a112aed5ff120c2b97bced9523ed39fe6c (patch) | |
| tree | 0a90d18185f0638ec743e783cdd1e3928216fa78 /media/libstagefright/mpeg2ts | |
| parent | d641af3e9faf6c053ccbeea1bc20790021e57a11 (diff) | |
| parent | 9ae62202b2bb19cc870361af7edd8e43f823d372 (diff) | |
| download | frameworks_av-1471e7a112aed5ff120c2b97bced9523ed39fe6c.zip frameworks_av-1471e7a112aed5ff120c2b97bced9523ed39fe6c.tar.gz frameworks_av-1471e7a112aed5ff120c2b97bced9523ed39fe6c.tar.bz2 | |
Merge "MPEG2PSExtractor: check number of bits left before skipping" into mnc-dev
Diffstat (limited to 'media/libstagefright/mpeg2ts')
| -rw-r--r-- | media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp b/media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp index 67ffad3..6d9fe9d 100644 --- a/media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp +++ b/media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp @@ -505,6 +505,10 @@ ssize_t MPEG2PSExtractor::dequeuePES() { optional_bytes_remaining -= 3; } + if (br.numBitsLeft() < optional_bytes_remaining * 8) { + return ERROR_MALFORMED; + } + br.skipBits(optional_bytes_remaining * 8); // ES data follows. |