commit 2adbeda4f46f88ddb17519d39cc13e183741e071
author Wei Jia <wjia@google.com> Tue Sep 09 19:43:15 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 09 19:43:16 2014 +0000
tree 07a5d63538a75c460af46058473cbefe54cd76ae
parent 9f8551ffa967bd8a4d0a52487a183dcf8b22d91f
parent f702d0415be7d5cb8c1801953b74adc1065c015e

Merge "NuPlayer: check mSource before deferencing it." into lmp-dev

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index c8bf8f0..a44de98 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1244,7 +1244,8 @@
     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;