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

Commit 96d69fdb authored by Marco Nelissen's avatar Marco Nelissen Committed by Automerger Merge Worker
Browse files

Merge "Limit iterations when parsing mkv file" into rvc-dev am: 84dff10e 

Change-Id: I5ce0803fa25acb9ebaa9c07c01f9b348a86c8de4
parents 751a55ef 84dff10e

media/extractors/mkv/MatroskaExtractor.cpp

+6 −1
Original line number Diff line number Diff line
@@ -339,7 +339,12 @@ void BlockIterator::advance() { 
}



void BlockIterator::advance_l() {

    for (;;) {

    for (int i = 0;; i++) {

        if (i == 1000) {

            ALOGE("no block found after %d iterations, stopping", i);

            mCluster = NULL;

            break;

        }

        long res = mCluster->GetEntry(mBlockEntryIndex, mBlockEntry);

        ALOGV("GetEntry returned %ld", res);