| commit | abc29d848e19449f55bb4a19226ef9594f3d030c | [log] [tgz] |
|---|---|---|
| author | Ray Essick <essick@google.com> | Tue Jun 02 17:51:37 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 02 17:51:37 2020 +0000 |
| tree | 294a6fcb8a58f5a9584f0d5fc0220858a512ecff | |
| parent | b7b552e563f0a192b343d5fcf3b5f8dff1d8c6a0 [diff] | |
| parent | f543f7ffc1f9db22d7bb0c29315d21004adb4330 [diff] |
Merge "Fix potential use-after-free issue" into oc-dev am: cb06eeab99 am: f543f7ffc1 Original change: undetermined Change-Id: Ie073af9204def3cc7bfbc9b9435cd65df443428f
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 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();