Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99187615 authored by Abhishek Arya's avatar Abhishek Arya Committed by Android Git Automerger
Browse files

am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8:... 

am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev

* commit 'd3b6f9c1':
  Check RTSP payload length
parents b49b1af0 d3b6f9c1

media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp

+3 −2
Original line number Diff line number Diff line
@@ -405,7 +405,8 @@ sp<ABuffer> AMPEG4AudioAssembler::removeLATMFraming(const sp<ABuffer> &buffer) { 
            }

        }

        

        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);