commit a1147ecea27dfad2280c7d1c2727c657f0da70a6
author Robert Shih <robertshih@google.com> Tue May 29 16:45:10 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 29 16:45:10 2018 -0700
tree eccff2eb3f2bc2bbc821b0a296d864433e161bbb
parent 1241f25bcbab4b4a8e9b818705829dff33ad7c63
parent 0941ae732d4e640fd3df0d156a2a78f64992470a

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

Change-Id: I23b045f8b3a51f4e4ab6d7c55d68e2c3551c5f4b

media/libstagefright/httplive/PlaylistFetcher.cpp

diff --git a/media/libstagefright/httplive/PlaylistFetcher.cpp b/media/libstagefright/httplive/PlaylistFetcher.cpp
index 00cf142..be90bcf 100644
--- a/media/libstagefright/httplive/PlaylistFetcher.cpp
+++ b/media/libstagefright/httplive/PlaylistFetcher.cpp
@@ -1015,7 +1015,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)