commit 2503f1a73940e5af00b796315555cd46a0ed235e
author Marco Nelissen <marcone@google.com> Fri Oct 05 22:59:31 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 05 22:59:31 2018 +0000
tree 2ed3409876c0866307b71027a5ae71c301664d25
parent 6391975a408328e0c1ec4a8c425c8786f5594525
parent 4235c6de560207ac15f1980b3a1693aa2fa8a37a

Merge "Fix potential NULL pointer crash"

media/libstagefright/MediaTrack.cpp

diff --git a/media/libstagefright/MediaTrack.cpp b/media/libstagefright/MediaTrack.cpp
index 99f6a45..4bd8a51 100644
--- a/media/libstagefright/MediaTrack.cpp
+++ b/media/libstagefright/MediaTrack.cpp
@@ -83,13 +83,13 @@
 
     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;
     }