From ab05b4ccb8ea59079d7f773aa0e090029c479bad Mon Sep 17 00:00:00 2001
From: Wei Jia <wjia@google.com>
Date: Tue, 2 Dec 2014 09:41:21 -0800
Subject: StreamingSource: check mTSParser before dereferencing it.

Bug: 18532335
Change-Id: I7819d8d359fe75ea4c827138e9aaa2454ccfe3b1
---
 media/libmediaplayerservice/nuplayer/StreamingSource.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'media')

diff --git a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp
index 27f5159..e54f5b9 100644
--- a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp
@@ -139,6 +139,10 @@ status_t NuPlayer::StreamingSource::feedMoreTSData() {
 }
 
 sp<MetaData> NuPlayer::StreamingSource::getFormatMeta(bool audio) {
+    if (mTSParser == NULL) {
+        return NULL;
+    }
+
     ATSParser::SourceType type =
         audio ? ATSParser::AUDIO : ATSParser::VIDEO;
 
-- 
cgit v1.1