Title: [273790] branches/safari-612.1.5-branch/Source/WebKit
- Revision
- 273790
- Author
- [email protected]
- Date
- 2021-03-02 19:08:30 -0800 (Tue, 02 Mar 2021)
Log Message
Cherry-pick r273304. rdar://problem/74953207
[macOS] Crash under AuxiliaryProcess::initializeSandbox
https://bugs.webkit.org/show_bug.cgi?id=222233
Unreviewed, address additional review feedback.
Add comment and logging when the WebKit client is setting the user directory suffix.
* Shared/mac/AuxiliaryProcessMac.mm:
(WebKit::initializeSandboxParameters):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273304 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.5-branch/Source/WebKit/ChangeLog (273789 => 273790)
--- branches/safari-612.1.5-branch/Source/WebKit/ChangeLog 2021-03-03 03:08:27 UTC (rev 273789)
+++ branches/safari-612.1.5-branch/Source/WebKit/ChangeLog 2021-03-03 03:08:30 UTC (rev 273790)
@@ -1,5 +1,35 @@
2021-03-02 Alan Coon <[email protected]>
+ Cherry-pick r273304. rdar://problem/74953207
+
+ [macOS] Crash under AuxiliaryProcess::initializeSandbox
+ https://bugs.webkit.org/show_bug.cgi?id=222233
+
+ Unreviewed, address additional review feedback.
+
+ Add comment and logging when the WebKit client is setting the user directory suffix.
+
+
+ * Shared/mac/AuxiliaryProcessMac.mm:
+ (WebKit::initializeSandboxParameters):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273304 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-02-23 Per Arne Vollan <[email protected]>
+
+ [macOS] Crash under AuxiliaryProcess::initializeSandbox
+ https://bugs.webkit.org/show_bug.cgi?id=222233
+
+ Unreviewed, address additional review feedback.
+
+ Add comment and logging when the WebKit client is setting the user directory suffix.
+
+ * Shared/mac/AuxiliaryProcessMac.mm:
+ (WebKit::initializeSandboxParameters):
+
+2021-03-02 Alan Coon <[email protected]>
+
Cherry-pick r273289. rdar://problem/74953476
UserMediaPermissionRequestManagerProxy may be released while computing capture device list
Modified: branches/safari-612.1.5-branch/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm (273789 => 273790)
--- branches/safari-612.1.5-branch/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm 2021-03-03 03:08:27 UTC (rev 273789)
+++ branches/safari-612.1.5-branch/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm 2021-03-03 03:08:30 UTC (rev 273790)
@@ -641,9 +641,13 @@
auto userDirectorySuffix = parameters.extraInitializationData.find("user-directory-suffix");
if (userDirectorySuffix != parameters.extraInitializationData.end()) {
String suffix = userDirectorySuffix->value;
+ WTFLogAlways("WebKit client is requesting user directory suffix: %s", suffix.utf8().data());
+ // Make sure the user directory suffix is not a path, since confstr will fail when the path does not exist.
auto firstPathSeparator = suffix.find("/");
- if (firstPathSeparator != notFound)
+ if (firstPathSeparator != notFound) {
suffix.truncate(firstPathSeparator);
+ WTFLogAlways("User directory suffix is a path, which will be truncated: %s", suffix.utf8().data());
+ }
sandboxParameters.setUserDirectorySuffix(suffix);
} else {
String clientIdentifier = codeSigningIdentifier(parameters.connectionIdentifier.xpcConnection.get());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
