commit 82f267012f29089c284340868de7375e77510e62
author Andrew Lewis <andrewlewis@google.com> Wed May 20 16:49:23 2020 +0100
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jun 10 00:35:54 2020 +0000
tree fc2fe7adf2c022af88bdeddb63deb2baf4a8e5fb
parent f191963f5645f59390b640136fd928e5a492aa84

Fix potential use-after-free issue

NuPlayerListener passed this out of its constructor to
IStreamSource->setListener, and it would get wrapped in a smart pointer,
then free'd when that method returned.

Move the setListener call after instantiation of NuPlayerListener to
avoid passing this out of the NuPlayerListener constructor.

Test: tested in presubmit
Bug: 151456667
Change-Id: I996d9ad9eaf0e52992b7f9e10fd94a94c350ad73
(cherry picked from commit aad519df7fe3b69c8247669ea77ce339a44e8c51)
(cherry picked from commit 6aaef5a99f15da847a8c55a137bfc6263829e8ff)

media/libmediaplayerservice/nuplayer/StreamingSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp
index f21d2b3..3250a48 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();