commit 4235c6de560207ac15f1980b3a1693aa2fa8a37a
author Marco Nelissen <marcone@google.com> Fri Oct 05 12:55:55 2018 -0700
committer Marco Nelissen <marcone@google.com> Fri Oct 05 13:00:34 2018 -0700
tree af8a7067c17fdb4dc20cc5fc09d1c7405da9d509
parent b4e880abdcde87ff89937f4f8de819af0cfe371f

Fix potential NULL pointer crash

Bug: 111407253
Test: manual

Change-Id: Ie76f0e5df4fac84f8bf949ab8b0e81122e92bf35

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;
     }