commit | 32f1e9f90254f50f37c2a1f3edebfa4705219d43 | [log] [tgz] |
---|---|---|
author | cdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> | Sun Jun 18 20:25:19 2017 +0000 |
committer | cdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> | Sun Jun 18 20:25:19 2017 +0000 |
tree | b45540a6daf6227e41b0d8641d59e8376118953f | |
parent | b44b208fd21dd5f34bb69e6f762f80e58d8bd94d [diff] |
Crash when re-entering MediaDevicesEnumerationRequest::cancel() https://bugs.webkit.org/show_bug.cgi?id=173522 <rdar://problem/31185739> Reviewed by Darin Adler. Source/WebCore: When a MediaDevicesRequest is started, it creates a MediaDevicesEnumerationRequest object and passes a completion handler to that MediaDevicesEnumerationRequest object. The completion handler holds a reference to the MediaDevicesRequest object so that its stays alive until the MediaDevicesEnumerationRequest either completes or is canceled. MediaDevicesRequest also holds a reference to the MediaDevicesEnumerationRequest object via its m_enumerationRequest data member. When the document is destroyed, both MediaDevicesRequest::contextDestroyed() and MediaDevicesEnumerationRequest::contextDestroyed() gets called and the other is not pre-determined. If MediaDevicesEnumerationRequest::contextDestroyed() gets called first then it calls MediaDevicesEnumerationRequest::cancel(). Calling cancel() ends up destroying the completion handler. Destroying the completion handler ends up dereferencing and destroying the MediaDevicesRequest object. The MediaDevicesRequest destructor would call MediaDevicesEnumerationRequest::cancel() again, causing us to re-enter it and assign nullptr to the completion callback again. Re-entering std::function's operator=(nullptr_t) is not safe because of the way it is implemented as we end up trying to destroy the lambda twice and crashing. Using a WTF::Function instead fixes this particular issue because re-entering WTF::Function's operator=(nullptr_t) is safe. However, this fix is not sufficient. Calling the MediaDevicesRequest destructor also dereferencing and destroys the MediaDevicesEnumerationRequest object. As a result, when MediaDevicesEnumerationRequest::contextDestroyed() returns from its call to cancel |this| is already dead when we call ContextDestructionObserver::contextDestroyed(). To address this issue, we now protect |this| in MediaDevicesEnumerationRequest::contextDestroyed(). Test: fast/mediastream/destroy-document-while-enumerating-devices.html * Modules/mediastream/MediaDevicesEnumerationRequest.cpp: (WebCore::MediaDevicesEnumerationRequest::contextDestroyed): Protect |this| as the call to cancel() may destroy |this| before calling ContextDestructionObserver::contextDestroyed() otherwise. * Modules/mediastream/MediaDevicesEnumerationRequest.h: Use WTF::Function instead of std::function for the completion handler as it is safer (in terms of re-entrency) and avoids unnecessary copying. * Modules/mediastream/MediaDevicesRequest.cpp: (WebCore::MediaDevicesRequest::~MediaDevicesRequest): Stop calling MediaDevicesEnumerationRequest::cancel(). When the destructor is called, the MediaDevicesEnumerationRequest has either completed or been canceled so there is no need to cancel again. I added an assertion to make sure it is the case. This avoids re-entering MediaDevicesEnumerationRequest::cancel() is some cases, which was risky. (WebCore::MediaDevicesRequest::start): Add comment for clarity and capture a Ref<> instead of a RefPtr<> now that we can since we use WTF::Function. Tools: Add API test for re-entering Function's assignment operators. * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WTF/Function.cpp: Added. (TestWebKitAPI::TestObject::TestObject): (TestWebKitAPI::TestObject::~TestObject): (TestWebKitAPI::TestObject::operator()): (TestWebKitAPI::TEST): LayoutTests: Add layout test coverage. This test would flakily crash before the fix because it relies on the order in which contextDestroyed() is called for MediaDevicesRequest and MediaDevicesEnumerationRequest. * fast/mediastream/destroy-document-while-enumerating-devices-expected.txt: Added. * fast/mediastream/destroy-document-while-enumerating-devices.html: Added. * fast/mediastream/resources/enumerate-devices-frame.html: Added. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@218465 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit is a cross-platform web browser engine. On iOS and macOS, it powers Safari, Mail, iBooks, and many other applications.
Visit WebKit Feature Status page to see which Web API has been implemented, in development, or under consideration.
Downloading Safari Technology Preview to test the latest version of WebKit.
Once your bug is filed, you will receive email when it is updated at each stage in the bug life cycle. After the bug is considered fixed, you may be asked to download the latest nightly and confirm that the fix works for you.
On Windows, follow the instructions on our website.
Run the following command to clone WebKit's Git SVN repository:
git clone git://git.webkit.org/WebKit.git WebKit
If you want to be able to commit changes to the repository, or just want to check out branches that aren’t contained in WebKit.git, you will need track WebKit's Subversion repository. You can run the following command to configure this and other options of the new Git clone for WebKit development.
Tools/Scripts/webkit-patch setup-git-clone
For information about this, and other aspects of using Git with WebKit, read the wiki page.
Run the following command to check out WebKit's subversion repository:
svn checkout https://svn.webkit.org/repository/webkit/trunk WebKit
Install Xcode and its command line tools if you haven't done so already:
xcode-select --install
Run the following command to build a debug build with debugging symbols and assertions:
Tools/Scripts/build-webkit --debug
For performance testing, and other purposes, use --release
instead.
You can open WebKit.xcworkspace
to build and debug WebKit within WebKit.
If you don't use a custom build location in Xcode preferences, you have to update the workspace settings to use WebKitBuild
directory. In menu bar, choose File > Workspace Settings, then click the Advanced button, select “Custom”, “Relative to Workspace”, and enter WebKitBuild
for both Products and Intermediates.
The first time after you install a new Xcode, you will need to run the following command to enable Xcode to build command line tools for iOS Simulator:
sudo Tools/Scripts/configure-xcode-for-ios-development
Without this step, you will see the error message: “target specifies product type ‘com.apple.product-type.tool’, but there’s no such product type for the ‘iphonesimulator’ platform.
” when building target JSCLLIntOffsetsExtractor
of project JavaScriptCore
.
Run the following command to build a debug build with debugging symbols and assertions for iOS:
Tools/Scripts/build-webkit --debug --ios-simulator.
Install the dependencies by running the following command:
Tools/gtk/install-dependencies
Then run the following command to build additional dependencies:
Tools/Scripts/update-webkitgtk-libs
Run the following command to build WebKit with debugging symbols for GTK+ port:
Tools/Scripts/build-webkit --debug --gtk
Note that the procedure for building a release tarball is different. For more information, see the wiki page.
For building WebKit on Windows, see the wiki page.
Run the following command to launch Safari with your local build of WebKit:
Tools/Scripts/run-safari --debug
The run-safari
script sets the DYLD_FRAMEWORK_PATH
environment variable to point to your build products, and then launches /Applications/Safari.app
. DYLD_FRAMEWORK_PATH
tells the system loader to prefer your build products over the frameworks installed in /System/Library/Frameworks
.
To run other applications with your local build of WebKit, run the following command:
Tools/Scripts/run-webkit-app <application-path>
Run the following command to launch iOS simulator with your local build of WebKit:
run-safari --debug --ios-simulator
In both cases, if you have built release builds instead, use --release
instead of --debug
.
Congratulations! You’re up and running. Now you can begin coding in WebKit and contribute your fixes and new features to the project. For details on submitting your code to the project, read Contributing Code.