commit | ab05b4ccb8ea59079d7f773aa0e090029c479bad | [log] [tgz] |
---|---|---|
author | Wei Jia <wjia@google.com> | Tue Dec 02 09:41:21 2014 -0800 |
committer | Wei Jia <wjia@google.com> | Tue Dec 02 17:43:39 2014 -0800 |
tree | 71c6ac716e4845c6bab413c4e55dd60631be4a96 | |
parent | f1828910d48bbd22e1392e6ab0ce31298d1f115c [diff] [blame] |
StreamingSource: check mTSParser before dereferencing it. Bug: 18532335 Change-Id: I7819d8d359fe75ea4c827138e9aaa2454ccfe3b1
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 @@ } sp<MetaData> NuPlayer::StreamingSource::getFormatMeta(bool audio) { + if (mTSParser == NULL) { + return NULL; + } + ATSParser::SourceType type = audio ? ATSParser::AUDIO : ATSParser::VIDEO;