Title: [273402] branches/safari-611-branch/Source/WebKit
Revision
273402
Author
repst...@apple.com
Date
2021-02-24 09:10:49 -0800 (Wed, 24 Feb 2021)

Log Message

Cherry-pick r273304. rdar://problem/74622914

    [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-611-branch/Source/WebKit/ChangeLog (273401 => 273402)


--- branches/safari-611-branch/Source/WebKit/ChangeLog	2021-02-24 17:10:46 UTC (rev 273401)
+++ branches/safari-611-branch/Source/WebKit/ChangeLog	2021-02-24 17:10:49 UTC (rev 273402)
@@ -1,5 +1,35 @@
 2021-02-23  Alan Coon  <alanc...@apple.com>
 
+        Cherry-pick r273304. rdar://problem/74622914
+
+    [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  <pvol...@apple.com>
+
+            [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-02-23  Alan Coon  <alanc...@apple.com>
+
         Cherry-pick r273289. rdar://problem/74623623
 
     UserMediaPermissionRequestManagerProxy may be released while computing capture device list

Modified: branches/safari-611-branch/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm (273401 => 273402)


--- branches/safari-611-branch/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm	2021-02-24 17:10:46 UTC (rev 273401)
+++ branches/safari-611-branch/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm	2021-02-24 17:10:49 UTC (rev 273402)
@@ -636,9 +636,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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to