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

Commit de47cd3c authored by Abhishek Arya's avatar Abhishek Arya Committed by Android Git Automerger
Browse files

am 3b77e940: am d146d466: am 6f561b93: Merge "MatroskaExtractor: detect... 

am 3b77e940: am d146d466: am 6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev

* commit '3b77e940':
  MatroskaExtractor: detect infinite loop when parsing NALs
parents 00887af1 3b77e940

media/libstagefright/matroska/MatroskaExtractor.cpp

+7 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "MatroskaExtractor.h"



#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/foundation/AUtils.h>

#include <media/stagefright/foundation/hexdump.h>

#include <media/stagefright/DataSource.h>

#include <media/stagefright/MediaBuffer.h>
@@ -630,7 +631,12 @@ status_t MatroskaSource::read( 
                    TRESPASS();

            }



            if (srcOffset + mNALSizeLen + NALsize > srcSize) {

            if (srcOffset + mNALSizeLen + NALsize <= srcOffset + mNALSizeLen) {

                frame->release();

                frame = NULL;



                return ERROR_MALFORMED;

            } else if (srcOffset + mNALSizeLen + NALsize > srcSize) {

                break;

            }