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

Commit 0e54fddd authored by Jeff Tinker's avatar Jeff Tinker Committed by Jessica Wagantall
Browse files

Fix security vulnerability in libstagefright 

bug: 28175045
Ticket: CYNGNOS-3020

Change-Id: Icee6c7eb5b761da4aa3e412fb71825508d74d38f
(cherry picked from commit d7d50415)
parent 5ba2b248

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;