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

Commit fc67784b authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

am f9230087: Merge "stagefright: matroska: don\'t crash on parsing error" into jb-mr2-dev 

* commit 'f9230087':
  stagefright: matroska: don't crash on parsing error
parents 1c93bb95 f9230087

media/libstagefright/matroska/MatroskaExtractor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -263,8 +263,8 @@ void BlockIterator::advance_l() { 
                    mCluster, nextCluster, pos, len);

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



            if (res > 0) {

                // EOF

            if (res != 0) {

                // EOF or error



                mCluster = NULL;

                break;