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

Commit 57f99489 authored by Ray Essick's avatar Ray Essick
Browse files

Validate pointers in getDuration() 

Bug: 204078075
Test: simple playback
Change-Id: I626a38882ea1565b5deb8ac27408de76f342a43b
parent 0eb0f136

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) {