diff options
| author | Wei Jia <wjia@google.com> | 2015-08-18 01:00:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-18 01:00:53 +0000 |
| commit | 431312997856ce689e683ee0639cf1f4bedab7f0 (patch) | |
| tree | 71c10c9a85888d7446f53d5a4c35b6056a94c380 /media/libstagefright/id3/ID3.cpp | |
| parent | 8a34499ab9987d962040881b4c8d66b655f65ae0 (diff) | |
| parent | 1a09d3521e8849dcb1090ecb50393f6e9ee140ec (diff) | |
| download | frameworks_av-431312997856ce689e683ee0639cf1f4bedab7f0.zip frameworks_av-431312997856ce689e683ee0639cf1f4bedab7f0.tar.gz frameworks_av-431312997856ce689e683ee0639cf1f4bedab7f0.tar.bz2 | |
am 1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev
* commit '1a09d3521e8849dcb1090ecb50393f6e9ee140ec':
libstagefright: check remaining data size before parsing it.
Diffstat (limited to 'media/libstagefright/id3/ID3.cpp')
| -rw-r--r-- | media/libstagefright/id3/ID3.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/id3/ID3.cpp b/media/libstagefright/id3/ID3.cpp index fa37b40..2a139b3 100644 --- a/media/libstagefright/id3/ID3.cpp +++ b/media/libstagefright/id3/ID3.cpp @@ -550,6 +550,9 @@ void ID3::Iterator::getstring(String8 *id, bool otherdata) const { return; } + if (mFrameSize < getHeaderLength() + 1) { + return; + } size_t n = mFrameSize - getHeaderLength() - 1; if (otherdata) { // skip past the encoding, language, and the 0 separator |