commit cb06eeab99dad7de64b3d6e26567c5ed825d9fa8
author Ray Essick <essick@google.com> Tue Jun 02 17:17:30 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 02 17:17:30 2020 +0000
tree 8be381e9fb1f6ba036774d52bfbff5d7f4a9ea32
parent 12ce8a9cd48b3fbb92b56b3e94b44c5bd47e2a24
parent 6aaef5a99f15da847a8c55a137bfc6263829e8ff

Merge "Fix potential use-after-free issue" into oc-dev

media/libmediaplayerservice/nuplayer/NuPlayerStreamListener.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerStreamListener.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerStreamListener.cpp
index ee70306..7dcee72 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerStreamListener.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerStreamListener.cpp
@@ -34,8 +34,6 @@
       mTargetHandler(targetHandler),
       mEOS(false),
       mSendDataNotification(true) {
-    mSource->setListener(this);
-
     mMemoryDealer = new MemoryDealer(kNumBuffers * kBufferSize);
     for (size_t i = 0; i < kNumBuffers; ++i) {
         sp<IMemory> mem = mMemoryDealer->allocate(kBufferSize);

media/libmediaplayerservice/nuplayer/StreamingSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp
index fc0803b..69392d6 100644
--- a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp
@@ -83,6 +83,7 @@
 
 void NuPlayer::StreamingSource::start() {
     mStreamListener = new NuPlayerStreamListener(mSource, NULL);
+    mSource->setListener(mStreamListener);
 
     uint32_t sourceFlags = mSource->flags();