diff options
| author | Abhishek Arya <aarya@google.com> | 2015-08-20 17:51:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 17:51:05 +0000 |
| commit | 2fd79fa39a0ec347a80ceb5b056ed5053002f59e (patch) | |
| tree | cf9fed3a45827c1b17e214957ed8e5f5c2133cf1 /media | |
| parent | 8a55bcb640c8842348eb41495fdb8fe82cb0465d (diff) | |
| parent | cb2acbfed69d18aa4693c03d8a77cd45daf8af8d (diff) | |
| download | frameworks_av-2fd79fa39a0ec347a80ceb5b056ed5053002f59e.zip frameworks_av-2fd79fa39a0ec347a80ceb5b056ed5053002f59e.tar.gz frameworks_av-2fd79fa39a0ec347a80ceb5b056ed5053002f59e.tar.bz2 | |
am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev
* commit 'cb2acbfed69d18aa4693c03d8a77cd45daf8af8d':
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); |