Title: [173481] branches/safari-600.1.17-branch/Source/WebCore
- Revision
- 173481
- Author
- [email protected]
- Date
- 2014-09-10 13:30:51 -0700 (Wed, 10 Sep 2014)
Log Message
Merge r173218. rdar://problem/18112559
Modified Paths
Diff
Modified: branches/safari-600.1.17-branch/Source/WebCore/ChangeLog (173480 => 173481)
--- branches/safari-600.1.17-branch/Source/WebCore/ChangeLog 2014-09-10 20:14:11 UTC (rev 173480)
+++ branches/safari-600.1.17-branch/Source/WebCore/ChangeLog 2014-09-10 20:30:51 UTC (rev 173481)
@@ -1,3 +1,24 @@
+2014-09-10 Matthew Hanson <[email protected]>
+
+ Merge r173218. rdar://problem/18112559
+
+ 2014-09-03 Brent Fulgham <[email protected]>
+
+ [Win] Improper release of unretained AVCFAssetResourceLoaderRef
+ https://bugs.webkit.org/show_bug.cgi?id=136493
+ <rdar://problem/18112559>
+
+ Reviewed by Eric Carlson.
+
+ Don't bother wrapping the return value of AVCFURLAssetGetResourceLoader in a
+ RetainPtr. We don't hold onto this value or want to control its lifetime; we just
+ want to pass it to the AVCFAssetResourceLoaderSetCallbacks function.
+
+ Use of the RetainPtr created a double-release and crash.
+
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::AVFWrapper::createAssetForURL):
+
2014-08-28 Lucas Forschler <[email protected]>
Merge r173097
Modified: branches/safari-600.1.17-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (173480 => 173481)
--- branches/safari-600.1.17-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-09-10 20:14:11 UTC (rev 173480)
+++ branches/safari-600.1.17-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-09-10 20:30:51 UTC (rev 173481)
@@ -1435,8 +1435,8 @@
loaderCallbacks.context = callbackContext();
loaderCallbacks.resourceLoaderShouldWaitForLoadingOfRequestedResource = AVFWrapper::resourceLoaderShouldWaitForLoadingOfRequestedResource;
- RetainPtr<AVCFAssetResourceLoaderRef> resourceLoader = adoptCF(AVCFURLAssetGetResourceLoader(m_avAsset.get()));
- AVCFAssetResourceLoaderSetCallbacks(resourceLoader.get(), &loaderCallbacks, globalLoaderDelegateQueue());
+ AVCFAssetResourceLoaderRef resourceLoader = AVCFURLAssetGetResourceLoader(m_avAsset.get());
+ AVCFAssetResourceLoaderSetCallbacks(resourceLoader, &loaderCallbacks, globalLoaderDelegateQueue());
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
