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

Commit 2503f1a7 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Fix potential NULL pointer crash"

parents 6391975a 4235c6de

media/libstagefright/MediaTrack.cpp

+2 −2
Original line number Diff line number Diff line
@@ -83,13 +83,13 @@ status_t MediaTrackCUnwrapper::read(MediaBufferBase **buffer, const ReadOptions 


    uint32_t opts = 0;



    if (options->getNonBlocking()) {

    if (options && options->getNonBlocking()) {

        opts |= CMediaTrackReadOptions::NONBLOCKING;

    }



    int64_t seekPosition = 0;

    MediaTrack::ReadOptions::SeekMode seekMode;

    if (options->getSeekTo(&seekPosition, &seekMode)) {

    if (options && options->getSeekTo(&seekPosition, &seekMode)) {

        opts |= SEEK;

        opts |= (uint32_t) seekMode;

    }