commit 7e8214620e57d16a79bec79e5f282ab0ab33459b
author Robert Shih <robertshih@google.com> Tue May 29 17:58:28 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 29 17:58:28 2018 -0700
tree d7346cefd0dc20dfd6fd6217b6fabe4b4ebf96e9
parent 1bf09f5b57c555f2e3be95e21576bf9370c1cfd5
parent a1147ecea27dfad2280c7d1c2727c657f0da70a6

Merge "httplive: live streaming initialization NULL check" into oc-dev am: e4aa5e88b2 am: 0941ae732d
am: a1147ecea2

Change-Id: I7bde4718aa8bba88477089ed8d746d2640e80b0e

media/libstagefright/httplive/PlaylistFetcher.cpp

diff --git a/media/libstagefright/httplive/PlaylistFetcher.cpp b/media/libstagefright/httplive/PlaylistFetcher.cpp
index f292c47..9f39b5e 100644
--- a/media/libstagefright/httplive/PlaylistFetcher.cpp
+++ b/media/libstagefright/httplive/PlaylistFetcher.cpp
@@ -1029,7 +1029,8 @@
     sp<AMessage> itemMeta;
     int64_t itemDurationUs;
     int32_t targetDuration;
-    if (mPlaylist->meta()->findInt32("target-duration", &targetDuration)) {
+    if (mPlaylist->meta() != NULL
+            && mPlaylist->meta()->findInt32("target-duration", &targetDuration)) {
         do {
             --index;
             if (!mPlaylist->itemAt(index, NULL /* uri */, &itemMeta)