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

Commit eb919fc1 authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

Merge "Fix security vulnerability in libstagefright" into klp-dev am:... 

Merge "Fix security vulnerability in libstagefright" into klp-dev am: eb37c37c am: 883b244f am: 31a3aa56 am: f1114192 am: 64149d75 am: 16f7ee09
am: f518e501

* commit 'f518e501':
  Fix security vulnerability in libstagefright

Change-Id: I5b6d66f369510e7e2f7378199a658ec1ec5e0a98
parents 177aee1b f518e501

media/libstagefright/DRMExtractor.cpp

+11 −1
Original line number Diff line number Diff line
@@ -200,7 +200,17 @@ status_t DRMSource::read(MediaBuffer **buffer, const ReadOptions *options) { 
                continue;

            }



            CHECK(dstOffset + 4 <= (*buffer)->size());

            if (dstOffset > SIZE_MAX - 4 ||

                dstOffset + 4 > SIZE_MAX - nalLength ||

                dstOffset + 4 + nalLength > (*buffer)->size()) {

                (*buffer)->release();

                (*buffer) = NULL;

                if (decryptedDrmBuffer.data) {

                    delete [] decryptedDrmBuffer.data;

                    decryptedDrmBuffer.data = NULL;

                }

                return ERROR_MALFORMED;

            }



            dstData[dstOffset++] = 0;

            dstData[dstOffset++] = 0;