diff options
| author | Wei Jia <wjia@google.com> | 2014-12-04 16:16:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 16:16:24 +0000 |
| commit | 73cdb2fd391a8f7f939f8a9104a8ae2b2838bae5 (patch) | |
| tree | 167b7c41caa96810ab261a8e5911f10504d6ee3a /media/libmediaplayerservice | |
| parent | 1e8368d19f792ff4150a88dd6afbac7d54878ea1 (diff) | |
| parent | c7883e6a5381bbc96029f2dc9f949d6b2f8b3558 (diff) | |
| download | frameworks_av-73cdb2fd391a8f7f939f8a9104a8ae2b2838bae5.zip frameworks_av-73cdb2fd391a8f7f939f8a9104a8ae2b2838bae5.tar.gz frameworks_av-73cdb2fd391a8f7f939f8a9104a8ae2b2838bae5.tar.bz2 | |
am c7883e6a: am b783a705: am ab05b4cc: StreamingSource: check mTSParser before dereferencing it.
* commit 'c7883e6a5381bbc96029f2dc9f949d6b2f8b3558':
StreamingSource: check mTSParser before dereferencing it.
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/StreamingSource.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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; |