diff options
| author | Wei Jia <wjia@google.com> | 2014-09-09 12:08:47 -0700 |
|---|---|---|
| committer | Wei Jia <wjia@google.com> | 2014-09-09 12:08:47 -0700 |
| commit | f702d0415be7d5cb8c1801953b74adc1065c015e (patch) | |
| tree | 6915e8e271d8d37f835cdc33c93799f92fb7263e /media | |
| parent | 62ce207291353a13dd722855102e99684259a517 (diff) | |
| download | frameworks_av-f702d0415be7d5cb8c1801953b74adc1065c015e.zip frameworks_av-f702d0415be7d5cb8c1801953b74adc1065c015e.tar.gz frameworks_av-f702d0415be7d5cb8c1801953b74adc1065c015e.tar.bz2 | |
NuPlayer: check mSource before deferencing it.
Bug: 17428608
Change-Id: I7b264d1288ed3c495434aedeeeef2fbfc3ca2f16
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index 4a5d18a..35cc1ee 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -1242,7 +1242,8 @@ status_t NuPlayer::feedDecoderInputData(bool audio, const sp<AMessage> &msg) { CHECK(msg->findMessage("reply", &reply)); if ((audio && mFlushingAudio != NONE) - || (!audio && mFlushingVideo != NONE)) { + || (!audio && mFlushingVideo != NONE) + || mSource == NULL) { reply->setInt32("err", INFO_DISCONTINUITY); reply->post(); return OK; |