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

Commit f97b6bee authored by Jon Larimer's avatar Jon Larimer Committed by Android (Google) Code Review
Browse files

Merge "Check integer overflow to prevent memory corruption" into klp-dev

parents 2ed42aea b158a9a5

media/libstagefright/DRMExtractor.cpp

+2 −1
Original line number Diff line number Diff line
@@ -186,7 +186,8 @@ status_t DRMSource::read(MediaBuffer **buffer, const ReadOptions *options) { 


            srcOffset += mNALLengthSize;



            if (srcOffset + nalLength > len) {

            size_t end = srcOffset + nalLength;

            if (end > len || end < srcOffset) {

                if (decryptedDrmBuffer.data) {

                    delete [] decryptedDrmBuffer.data;

                    decryptedDrmBuffer.data = NULL;