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

Commit 47227ae1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix overflow/dos in 3gg text description parsing"

parents fdab4409 38cf7577

media/libstagefright/timedtext/TextDescriptions.cpp

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ status_t TextDescriptions::extract3GPPGlobalDescriptions( 
        tmpData += 8;

        size_t remaining = size - 8;



        if (size < chunkSize) {

        if (chunkSize <= 8 || size < chunkSize) {

            return OK;

        }

        switch(chunkType) {

media/libstagefright/timedtext/TextDescriptions2.cpp

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ status_t TextDescriptions2::extract3GPPGlobalDescriptions( 
        tmpData += 8;

        size_t remaining = size - 8;



        if (size < chunkSize) {

        if (chunkSize <= 8 || size < chunkSize) {

            return OK;

        }

        switch(chunkType) {