commit 557bdaa8d244b97afcdb75eeab06278a0fb93d6f
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 21 04:12:22 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 21 04:12:22 2020 +0000
tree b78061941b4425e400bddabf72325b792b2a38b0
parent d9ea505469a0cdb97ecfa15f6e5d88b78e50fded
parent aad519df7fe3b69c8247669ea77ce339a44e8c51

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

media/libmediaplayerservice/nuplayer/NuPlayerStreamListener.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerStreamListener.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerStreamListener.cpp
index b5142ed..a532603 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 14f1323..bec27d3 100644
--- a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp
@@ -79,6 +79,7 @@
 
 void NuPlayer::StreamingSource::start() {
     mStreamListener = new NuPlayerStreamListener(mSource, NULL);
+    mSource->setListener(mStreamListener);
 
     uint32_t sourceFlags = mSource->flags();