Title: [258291] branches/safari-610.1.7-branch/Source/WebKit
- Revision
- 258291
- Author
- alanc...@apple.com
- Date
- 2020-03-11 15:26:10 -0700 (Wed, 11 Mar 2020)
Log Message
Cherry-pick r258288. rdar://problem/60341123
[macOS] Crash under WebKit::WebProcessPool::platformInitialize()
https://bugs.webkit.org/show_bug.cgi?id=208945
Reviewed by Tim Horton.
Check that accessibility library is present before attempting to call functions in it.
No new tests, since I am not able to reproduce.
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeWebProcess):
* UIProcess/Cocoa/WebProcessProxyCocoa.mm:
(WebKit::WebProcessProxy::unblockAccessibilityServerIfNeeded):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@258288 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.7-branch/Source/WebKit/ChangeLog (258290 => 258291)
--- branches/safari-610.1.7-branch/Source/WebKit/ChangeLog 2020-03-11 22:22:12 UTC (rev 258290)
+++ branches/safari-610.1.7-branch/Source/WebKit/ChangeLog 2020-03-11 22:26:10 UTC (rev 258291)
@@ -1,3 +1,41 @@
+2020-03-11 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r258288. rdar://problem/60341123
+
+ [macOS] Crash under WebKit::WebProcessPool::platformInitialize()
+ https://bugs.webkit.org/show_bug.cgi?id=208945
+
+ Reviewed by Tim Horton.
+
+ Check that accessibility library is present before attempting to call functions in it.
+
+ No new tests, since I am not able to reproduce.
+
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ * UIProcess/Cocoa/WebProcessProxyCocoa.mm:
+ (WebKit::WebProcessProxy::unblockAccessibilityServerIfNeeded):
+
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@258288 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-03-11 Per Arne Vollan <pvol...@apple.com>
+
+ [macOS] Crash under WebKit::WebProcessPool::platformInitialize()
+ https://bugs.webkit.org/show_bug.cgi?id=208945
+
+ Reviewed by Tim Horton.
+
+ Check that accessibility library is present before attempting to call functions in it.
+
+ No new tests, since I am not able to reproduce.
+
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ * UIProcess/Cocoa/WebProcessProxyCocoa.mm:
+ (WebKit::WebProcessProxy::unblockAccessibilityServerIfNeeded):
+
2020-03-11 Russell Epstein <repst...@apple.com>
Cherry-pick r258225. rdar://problem/60342513
Modified: branches/safari-610.1.7-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (258290 => 258291)
--- branches/safari-610.1.7-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-03-11 22:22:12 UTC (rev 258290)
+++ branches/safari-610.1.7-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-03-11 22:26:10 UTC (rev 258291)
@@ -455,7 +455,7 @@
}
#if ENABLE(CFPREFS_DIRECT_MODE)
- if (_AXSApplicationAccessibilityEnabled()) {
+ if (libAccessibilityLibrary() && _AXSApplicationAccessibilityEnabled()) {
SandboxExtension::Handle preferencesExtensionHandle;
SandboxExtension::createHandleForMachLookup("com.apple.cfprefsd.daemon", WTF::nullopt, preferencesExtensionHandle);
parameters.preferencesExtensionHandle = WTFMove(preferencesExtensionHandle);
Modified: branches/safari-610.1.7-branch/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm (258290 => 258291)
--- branches/safari-610.1.7-branch/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm 2020-03-11 22:22:12 UTC (rev 258290)
+++ branches/safari-610.1.7-branch/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm 2020-03-11 22:26:10 UTC (rev 258291)
@@ -44,6 +44,10 @@
#import <_javascript_Core/RemoteInspectorConstants.h>
#endif
+#if PLATFORM(COCOA)
+SOFT_LINK_LIBRARY_OPTIONAL(libAccessibility)
+#endif
+
namespace WebKit {
static const Seconds unexpectedActivityDuration = 10_s;
@@ -230,6 +234,8 @@
{
if (m_hasSentMessageToUnblockAccessibilityServer)
return;
+ if (!libAccessibilityLibrary())
+ return;
if (!_AXSApplicationAccessibilityEnabled())
return;
if (!processIdentifier())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
