| commit | 5319e2d1a79d6305f5f6465cdbda68556209b4b9 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu May 21 04:36:12 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 21 04:36:12 2020 +0000 |
| tree | b78061941b4425e400bddabf72325b792b2a38b0 | |
| parent | 322b92c202e511139766c39a88221158eae7d8b7 [diff] | |
| parent | 282b2897ed6519281db41308803943fd9d07555c [diff] |
Merge "Fix potential use-after-free issue" into rvc-dev am: 557bdaa8d2 am: 282b2897ed Change-Id: I72b754fe9975e81a4bba4e422a4b0dfa8ebff8bd
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);
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();