diff options
| author | Abhishek Arya <aarya@google.com> | 2015-08-20 19:47:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 19:47:10 +0000 |
| commit | 4a5a99d91e7d071823bb9c97c80bee602d74f808 (patch) | |
| tree | 903b0a6e352c23f5cc02cbd9c10ee55b0457380c | |
| parent | 1b1152f7451ef3849e79f17b4cbe91f916788e50 (diff) | |
| parent | fb5c8f444cedd9be166e68631cb876f2b3e6f257 (diff) | |
| download | frameworks_av-4a5a99d91e7d071823bb9c97c80bee602d74f808.zip frameworks_av-4a5a99d91e7d071823bb9c97c80bee602d74f808.tar.gz frameworks_av-4a5a99d91e7d071823bb9c97c80bee602d74f808.tar.bz2 | |
am fb5c8f44: am 99187615: am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev
* commit 'fb5c8f444cedd9be166e68631cb876f2b3e6f257':
Check RTSP payload length
| -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); |