summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/DataSource.cpp
diff options
context:
space:
mode:
authorWonsik Kim <wonsik@google.com>2015-09-08 17:32:28 +0900
committerWonsik Kim <wonsik@google.com>2015-09-09 13:58:29 +0900
commit316c3d929ffb004b0150d515e82aede02208ce97 (patch)
treecc281ba1a211e352d0e40e980c4d911d5a22f805 /media/libstagefright/DataSource.cpp
parent35e03636d6fa0c7c33c67e10686657849a61aff8 (diff)
downloadframeworks_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/DataSource.cpp')
-rw-r--r--media/libstagefright/DataSource.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp
index 75ef288..5020c6c 100644
--- a/media/libstagefright/DataSource.cpp
+++ b/media/libstagefright/DataSource.cpp
@@ -246,7 +246,7 @@ sp<DataSource> DataSource::CreateFromURI(
*contentType = httpSource->getMIMEType();
}
- source = new NuCachedSource2(
+ source = NuCachedSource2::Create(
httpSource,
cacheConfig.isEmpty() ? NULL : cacheConfig.string(),
disconnectAtHighwatermark);