Changeset 232160 in webkit

Timestamp:

May 24, 2018, 12:32:12 PM (8 years ago)

Author:

Brent Fulgham

Message:

REGRESSION(r230269): ASSERTION FAILED: sendRightCount == 1 at ProcessLauncherMac.mm(218)
​https://bugs.webkit.org/show_bug.cgi?id=185687
<rdar://problem/39386361>

Reviewed by Brady Eidson.

In r230269 I added an assertion to help identify cases where we were doing bad
bookkeeping in our port send rights. I assumed that because we were adding
one send right, that when we went to close down the connection that we should
have only one send right.

I have since discovered that this assumption is invalid, and that I should
only be checking that we have AT LEAST ONE send right at the time we attempt
to remove it.

This patch changes the assertion to confirm that we have at least one send
right before we remove the send right.

• UIProcess/Launcher/mac/ProcessLauncherMac.mm:

(WebKit::ProcessLauncher::launchProcess):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Launcher/mac/ProcessLauncherMac.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-05-24  Brent Fulgham  <bfulgham@apple.com>
+
+        REGRESSION(r230269): ASSERTION FAILED: sendRightCount == 1 at ProcessLauncherMac.mm(218)
+        https://bugs.webkit.org/show_bug.cgi?id=185687
+        <rdar://problem/39386361>
+
+        Reviewed by Brady Eidson.
+
+        In r230269 I added an assertion to help identify cases where we were doing bad
+        bookkeeping in our port send rights. I assumed that because we were adding
+        one send right, that when we went to close down the connection that we should
+        have only one send right.
+        
+        I have since discovered that this assumption is invalid, and that I should
+        only be checking that we have AT LEAST ONE send right at the time we attempt
+        to remove it.
+
+        This patch changes the assertion to confirm that we have at least one send
+        right before we remove the send right.
+
+        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+        (WebKit::ProcessLauncher::launchProcess):
+
 2018-05-24  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm

@@ -216 +216 @@
         mach_port_urefs_t sendRightCount = 0;
         mach_port_get_refs(mach_task_self(), listeningPort, MACH_PORT_RIGHT_SEND, &sendRightCount);
-        ASSERT(sendRightCount == 1);
+        ASSERT(sendRightCount >= 1);
 #endif
 
@@ -253 +253 @@
             mach_port_urefs_t sendRightCount = 0;
             mach_port_get_refs(mach_task_self(), listeningPort, MACH_PORT_RIGHT_SEND, &sendRightCount);
-            ASSERT(sendRightCount == 1);
+            ASSERT(sendRightCount >= 1);
 #endif