diff options
| author | Robert Shih <robertshih@google.com> | 2020-03-28 21:06:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-03-28 21:06:29 +0000 |
| commit | 01e349c1e70e48d9d4c88ad51b0732d674eb89ba (patch) | |
| tree | 02744cf9a39da43a398d55cbd127a2e8cbf5bb71 | |
| parent | 2c652db6efb758f7418895d3af2e69e6974bd36f (diff) | |
| parent | 2ba16f6134bd67e07ea0daa29aac5adb3155872b (diff) | |
| download | frameworks_av-01e349c1e70e48d9d4c88ad51b0732d674eb89ba.tar.gz frameworks_av-01e349c1e70e48d9d4c88ad51b0732d674eb89ba.tar.bz2 frameworks_av-01e349c1e70e48d9d4c88ad51b0732d674eb89ba.zip | |
Merge "rtsp: fix integer overflow caused by malformed packets" into qt-qpr1-dev
| -rw-r--r-- | media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp b/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp index 1e434cbcea..9df3508d85 100644 --- a/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp +++ b/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp @@ -338,6 +338,12 @@ ARTPAssembler::AssemblyStatus AMPEG4ElementaryAssembler::addPacket( ABitReader bits(buffer->data() + offset, buffer->size() - offset); unsigned auxSize = bits.getBits(mAuxiliaryDataSizeLength); + if (buffer->size() < auxSize) { + ALOGE("b/123940919 auxSize %u", auxSize); + android_errorWriteLog(0x534e4554, "123940919"); + queue->erase(queue->begin()); + return MALFORMED_PACKET; + } offset += (mAuxiliaryDataSizeLength + auxSize + 7) / 8; } @@ -346,6 +352,12 @@ ARTPAssembler::AssemblyStatus AMPEG4ElementaryAssembler::addPacket( it != headers.end(); ++it) { const AUHeader &header = *it; + if (buffer->size() < header.mSize) { + ALOGE("b/123940919 AU_size %u", header.mSize); + android_errorWriteLog(0x534e4554, "123940919"); + queue->erase(queue->begin()); + return MALFORMED_PACKET; + } if (buffer->size() < offset + header.mSize) { return MALFORMED_PACKET; } |