Changeset 286563 in webkit

Timestamp:

Dec 6, 2021, 1:03:27 PM (5 years ago)

Author:

Brent Fulgham

Message:

REGRESSION (r286527): Three API tests crashing under WebKit::ProcessLauncher::launchProcess()
​https://bugs.webkit.org/show_bug.cgi?id=233882
<rdar://problem/86111726>

Reviewed by Brent Fulgham.

Correct the eventHandler to capture the process name, rather than using a raw pointer to the character string.

• UIProcess/Launcher/cocoa/ProcessLauncherCocoa.mm:

(WebKit::ProcessLauncher::launchProcess):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Launcher/cocoa/ProcessLauncherCocoa.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-12-06  Brent Fulgham  <bfulgham@apple.com>
+
+        REGRESSION (r286527): Three API tests crashing under WebKit::ProcessLauncher::launchProcess()
+        https://bugs.webkit.org/show_bug.cgi?id=233882
+        <rdar://problem/86111726>
+
+        Reviewed by Brent Fulgham.
+
+        Correct the eventHandler to capture the process name, rather than using a raw pointer to the character string.
+
+        * UIProcess/Launcher/cocoa/ProcessLauncherCocoa.mm:
+        (WebKit::ProcessLauncher::launchProcess):
+
 2021-12-06  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/UIProcess/Launcher/cocoa/ProcessLauncherCocoa.mm

@@ -240 +240 @@
     xpc_dictionary_set_value(bootstrapMessage.get(), "extra-initialization-data", extraInitializationData.get());
 
-    auto errorHandlerImpl = [weakProcessLauncher = WeakPtr { *this }, listeningPort, name] (xpc_object_t event) {
+    auto errorHandlerImpl = [weakProcessLauncher = WeakPtr { *this }, listeningPort, logName = String(name)] (xpc_object_t event) {
         ASSERT(!event || xpc_get_type(event) == XPC_TYPE_ERROR);
 
@@ -251 +251 @@
 
 #if ERROR_DISABLED
-        UNUSED_PARAM(name);
-#endif
-
-        LOG_ERROR("Error while launching %s: %s", name, xpc_dictionary_get_string(event, XPC_ERROR_KEY_DESCRIPTION));
+        UNUSED_PARAM(logName);
+#endif
+
+        if (event)
+            LOG_ERROR("Error while launching %s: %s", logName.utf8().data(), xpc_dictionary_get_string(event, XPC_ERROR_KEY_DESCRIPTION));
+        else
+            LOG_ERROR("Error while launching %s: No xpc_object_t event available.", logName.utf8().data());
 
 #if ASSERT_ENABLED