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

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

am 3459ea26: am de47cd3c: am 3b77e940: am d146d466: am 6f561b93: Merge... 

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

* commit '3459ea26':
  MatroskaExtractor: detect infinite loop when parsing NALs
parents 06682f94 3459ea26

media/libstagefright/matroska/MatroskaExtractor.cpp

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

#include "MatroskaExtractor.h"





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

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

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

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

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

#include <media/stagefright/DataSource.h>

#include <media/stagefright/DataSource.h>

#include <media/stagefright/MediaBuffer.h>

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

                    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;

                break;

            }

            }