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

Commit 6b927a07 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Validate pointers in getDuration()"

parents 25e8230d 57f99489

media/libmediaplayerservice/nuplayer/RTPSource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ status_t NuPlayer::RTPSource::getDuration(int64_t *durationUs) { 
    *durationUs = 0ll;



    int64_t audioDurationUs;

    if (mAudioTrack != NULL

    if (mAudioTrack != NULL && mAudioTrack->getFormat() != NULL

            && mAudioTrack->getFormat()->findInt64(

                kKeyDuration, &audioDurationUs)

            && audioDurationUs > *durationUs) {
@@ -344,7 +344,7 @@ status_t NuPlayer::RTPSource::getDuration(int64_t *durationUs) { 
    }



    int64_t videoDurationUs;

    if (mVideoTrack != NULL

    if (mVideoTrack != NULL && mVideoTrack->getFormat() != NULL

            && mVideoTrack->getFormat()->findInt64(

                kKeyDuration, &videoDurationUs)

            && videoDurationUs > *durationUs) {