Changeset 273790 in webkit

Timestamp:

Mar 2, 2021, 7:08:30 PM (6 years ago)

Author:

Alan Coon

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

Location:

branches/safari-612.1.5-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/mac/AuxiliaryProcessMac.mm (modified) (1 diff)

branches/safari-612.1.5-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2021-03-02  Alan Coon  <alancoon@apple.com>
+
+        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  <pvollan@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-03-02  Alan Coon  <alancoon@apple.com>
 

branches/safari-612.1.5-branch/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm

@@ -642 +642 @@
         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 {