Changeset 249273 in webkit

Timestamp:

Aug 29, 2019, 8:25:32 AM (7 years ago)

Author:

Chris Dumez

Message:

Crash when mach_port_deallocate() returns KERN_INVALID_NAME
​https://bugs.webkit.org/show_bug.cgi?id=201248
<rdar://problem/54813890>

Reviewed by Alex Christensen.

• wtf/cocoa/MachSendRight.cpp:

(WTF::deallocateSendRightSafely):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/cocoa/MachSendRight.cpp (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-08-29  Chris Dumez  <cdumez@apple.com>
+
+        Crash when mach_port_deallocate() returns KERN_INVALID_NAME
+        https://bugs.webkit.org/show_bug.cgi?id=201248
+        <rdar://problem/54813890>
+
+        Reviewed by Alex Christensen.
+
+        * wtf/cocoa/MachSendRight.cpp:
+        (WTF::deallocateSendRightSafely):
+
 2019-08-25  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WTF/wtf/cocoa/MachSendRight.cpp

@@ -31 +31 @@
 #include <utility>
 
+#define LOG_CHANNEL_PREFIX Log
+
 namespace WTF {
+
+#if RELEASE_LOG_DISABLED
+WTFLogChannel LogProcess = { WTFLogChannelState::On, "Process", WTFLogLevel::Error };
+#else
+WTFLogChannel LogProcess = { WTFLogChannelState::On, "Process", WTFLogLevel::Error, LOG_CHANNEL_WEBKIT_SUBSYSTEM, OS_LOG_DEFAULT };
+#endif
 
 static void retainSendRight(mach_port_t port)
@@ -66 +74 @@
         return;
 
-    LOG_ERROR("mach_port_deallocate error for port %d: %s (%#x)", port, mach_error_string(kr), kr);
-    if (kr == KERN_INVALID_RIGHT)
+    RELEASE_LOG_ERROR(Process, "mach_port_deallocate error for port %d: %{private}s (%#x)", port, mach_error_string(kr), kr);
+    if (kr == KERN_INVALID_RIGHT || kr == KERN_INVALID_NAME)
         CRASH();
 }