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

Commit 6b8937f4 authored by Marco Nelissen's avatar Marco Nelissen
Browse files

Don't abort on nonsensical seek requests 

and don't abort client when remote process died.

Bug: 30865267
Test: manual
Change-Id: I6239aa60a5f581dcbbe94bd187ba981141ecd976
parent 8811695b

media/libstagefright/NuMediaExtractor.cpp

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ NuMediaExtractor::~NuMediaExtractor() { 
    for (size_t i = 0; i < mSelectedTracks.size(); ++i) {

        TrackInfo *info = &mSelectedTracks.editItemAt(i);



        CHECK_EQ((status_t)OK, info->mSource->stop());

        status_t err = info->mSource->stop();

        ALOGE_IF(err != OK, "error %d stopping track %zu", err, i);

    }



    mSelectedTracks.clear();

media/libstagefright/matroska/MatroskaExtractor.cpp

+10 −0
Original line number Diff line number Diff line
@@ -377,6 +377,16 @@ void BlockIterator::seek( 


    *actualFrameTimeUs = -1ll;



    if (seekTimeUs > INT64_MAX / 1000ll ||

            seekTimeUs < INT64_MIN / 1000ll ||

            (mExtractor->mSeekPreRollNs > 0 &&

                    (seekTimeUs * 1000ll) < INT64_MIN + mExtractor->mSeekPreRollNs) ||

            (mExtractor->mSeekPreRollNs < 0 &&

                    (seekTimeUs * 1000ll) > INT64_MAX + mExtractor->mSeekPreRollNs)) {

        ALOGE("cannot seek to %lld", (long long) seekTimeUs);

        return;

    }



    const int64_t seekTimeNs = seekTimeUs * 1000ll - mExtractor->mSeekPreRollNs;



    mkvparser::Segment* const pSegment = mExtractor->mSegment;