diff options
| author | Wonsik Kim <wonsik@google.com> | 2015-09-08 17:32:28 +0900 |
|---|---|---|
| committer | Wonsik Kim <wonsik@google.com> | 2015-09-09 13:58:29 +0900 |
| commit | 316c3d929ffb004b0150d515e82aede02208ce97 (patch) | |
| tree | cc281ba1a211e352d0e40e980c4d911d5a22f805 /media/libstagefright/AwesomePlayer.cpp | |
| parent | 35e03636d6fa0c7c33c67e10686657849a61aff8 (diff) | |
| download | frameworks_av-316c3d929ffb004b0150d515e82aede02208ce97.zip frameworks_av-316c3d929ffb004b0150d515e82aede02208ce97.tar.gz frameworks_av-316c3d929ffb004b0150d515e82aede02208ce97.tar.bz2 | |
NuCachedSource2: fix possible erroneous early free
Because the constructor of NuCachedSource2 sent a message to
AHandlerReflector object, AHandlerReflector::onMessageReceived could
have executed just before the object gets wrapped in a strong
pointer, resulting in erroneous early free. Fix the issue by using
static Create function to ensure the message is sent after the
object is wrapped in a sp.
Bug: 23882800
Change-Id: I38a9d7a3083f184b4c81d0b00ba1661721278855
Diffstat (limited to 'media/libstagefright/AwesomePlayer.cpp')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 4e6c2a6..3cd0b0e 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -2290,11 +2290,11 @@ status_t AwesomePlayer::finishSetDataSource_l() { // The widevine extractor does its own caching. #if 0 - mCachedSource = new NuCachedSource2( + mCachedSource = NuCachedSource2::Create( new ThrottledSource( mConnectingDataSource, 50 * 1024 /* bytes/sec */)); #else - mCachedSource = new NuCachedSource2( + mCachedSource = NuCachedSource2::Create( mConnectingDataSource, cacheConfig.isEmpty() ? NULL : cacheConfig.string(), disconnectAtHighwatermark); |