diff options
| author | Abhishek Arya <aarya@google.com> | 2015-08-20 19:31:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 19:31:06 +0000 |
| commit | 99187615b2cb42e39842083c2998a97e8277a5d5 (patch) | |
| tree | c617d923d63d2ef7fb3e0befabe0eeda4e63c6c7 /media | |
| parent | b49b1af06952c310dd715234e30e646db3d525b0 (diff) | |
| parent | d3b6f9c17ed10df01d682b0fac6b13fca396e5fb (diff) | |
| download | frameworks_av-99187615b2cb42e39842083c2998a97e8277a5d5.zip frameworks_av-99187615b2cb42e39842083c2998a97e8277a5d5.tar.gz frameworks_av-99187615b2cb42e39842083c2998a97e8277a5d5.tar.bz2 | |
am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev
* commit 'd3b6f9c17ed10df01d682b0fac6b13fca396e5fb':
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 1f76068..a1a6576 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); |