commit 37ff0e6639e90ca49d4f0386a76c09437b459efd
author Wei Jia <wjia@google.com> Fri Apr 21 11:24:45 2017 -0700
committer Wei Jia <wjia@google.com> Fri Apr 21 11:24:45 2017 -0700
tree a40d9d2f79dd9e3822335741afb8470efec038fc
parent b6ed37ed0e1176c3458294abae0ea1b11c30d44f

NuPlayerDecoder: check mCodec before dereferencing it.

Test: media cts tests
Bug: 37538141
Change-Id: Ib95fd4786242d6742f3bdc7aab28f79d43e8da81

media/libmediaplayerservice/nuplayer/NuPlayerDecoderBase.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoderBase.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoderBase.cpp
index 1210dc9..d0de7b0 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoderBase.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoderBase.cpp
@@ -43,8 +43,7 @@
 }
 
 NuPlayer::DecoderBase::~DecoderBase() {
-    mDecoderLooper->unregisterHandler(id());
-    mDecoderLooper->stop();
+    stopLooper();
 }
 
 static
@@ -73,6 +72,11 @@
     mDecoderLooper->registerHandler(this);
 }
 
+void NuPlayer::DecoderBase::stopLooper() {
+    mDecoderLooper->unregisterHandler(id());
+    mDecoderLooper->stop();
+}
+
 void NuPlayer::DecoderBase::setParameters(const sp<AMessage> &params) {
     sp<AMessage> msg = new AMessage(kWhatSetParameters, this);
     msg->setMessage("params", params);