| commit | e2288aa957f6b49b33760acfd7c54f9e95d89a1e | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu May 21 04:44:50 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 21 04:44:50 2020 +0000 |
| tree | 73f11c3714c79eafa20426a6388f45ff5fa5e28c | |
| parent | 5edde0885b86706640b9e5cb047dbd7e5889eca7 [diff] | |
| parent | 95a1d0514b857778d878fd11d3e6011dcc8788d7 [diff] |
Merge "Fix potential use-after-free issue" into rvc-dev am: 557bdaa8d2 am: 282b2897ed am: 95a1d0514b Change-Id: Ic38e39c6b3a7159c02886e7712ab023ff54fc2f2
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();