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

Commit 9e01d68b authored by Jon Larimer's avatar Jon Larimer Committed by Android Git Automerger
Browse files

am 64459f96: am 3e9ed500: am 8a1a5d17: am 9707195b: am f97b6bee: Merge "Check... 

am 64459f96: am 3e9ed500: am 8a1a5d17: am 9707195b: am f97b6bee: Merge "Check integer overflow to prevent memory corruption" into klp-dev

* commit '64459f96':
  Check integer overflow to prevent memory corruption
parents d223d9bb 64459f96

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;