commit 57f99489868a8be9bdc72727af4e29876d6675c0
author Ray Essick <essick@google.com> Sun Jan 16 20:38:26 2022 -0800
committer Ray Essick <essick@google.com> Sun Jan 16 20:38:26 2022 -0800
tree a8a6018cbe9463b2b38bb5ae399c573ead8bf219
parent 0eb0f1368486e306ae0fe3dc287dfe27dd47539f

Validate pointers in getDuration()

Bug: 204078075
Test: simple playback
Change-Id: I626a38882ea1565b5deb8ac27408de76f342a43b

media/libmediaplayerservice/nuplayer/RTPSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/RTPSource.cpp b/media/libmediaplayerservice/nuplayer/RTPSource.cpp
index 4d6a483..6a17972 100644
--- a/media/libmediaplayerservice/nuplayer/RTPSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/RTPSource.cpp
@@ -336,7 +336,7 @@
     *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 @@
     }
 
     int64_t videoDurationUs;
-    if (mVideoTrack != NULL
+    if (mVideoTrack != NULL && mVideoTrack->getFormat() != NULL
             && mVideoTrack->getFormat()->findInt64(
                 kKeyDuration, &videoDurationUs)
             && videoDurationUs > *durationUs) {