| commit | b6b78798a47a74d511b9bcd6543b71cb675730bd | [log] [tgz] |
|---|---|---|
| author | Ray Essick <essick@google.com> | Tue Jun 02 18:06:50 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 02 18:06:50 2020 +0000 |
| tree | 2ad564ccd79a8b3ef9340381f03ff35694501b2a | |
| parent | 284841d9e38958afca6f95f5bdbcdfb960a4dfa7 [diff] | |
| parent | abc29d848e19449f55bb4a19226ef9594f3d030c [diff] |
Merge "Fix potential use-after-free issue" into oc-dev am: cb06eeab99 am: f543f7ffc1 am: abc29d848e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11566487 Change-Id: Ic3e618a12eaac79e04857483ccb1cef606072079
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);
diff --git a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp index b3da53f..88fc782 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();