diff options
| author | Abhishek Arya <aarya@google.com> | 2015-08-20 17:58:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 17:58:52 +0000 |
| commit | a27fe8d7cc1413041e38f8c74f1f6510bdc44627 (patch) | |
| tree | c367f1dfe645a46f280bab71b8b950d78a43970d /media | |
| parent | 776bfd806a1619ac0944d4ea36330c4cde4d665d (diff) | |
| parent | 2fd79fa39a0ec347a80ceb5b056ed5053002f59e (diff) | |
| download | frameworks_av-a27fe8d7cc1413041e38f8c74f1f6510bdc44627.zip frameworks_av-a27fe8d7cc1413041e38f8c74f1f6510bdc44627.tar.gz frameworks_av-a27fe8d7cc1413041e38f8c74f1f6510bdc44627.tar.bz2 | |
am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev
* commit '2fd79fa39a0ec347a80ceb5b056ed5053002f59e':
Check RTSP payload length
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp index aa8ffc6..851805f 100644 --- a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp +++ b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp @@ -404,8 +404,9 @@ sp<ABuffer> AMPEG4AudioAssembler::removeLATMFraming(const sp<ABuffer> &buffer) { break; } } - - CHECK_LE(offset + payloadLength, buffer->size()); + + CHECK_LT(offset, buffer->size()); + CHECK_LE(payloadLength, buffer->size() - offset); memcpy(out->data() + out->size(), &ptr[offset], payloadLength); out->setRange(0, out->size() + payloadLength); |