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