Attachment 341209 Details for Bug 185687 – Patch

[patch] Patch

bug-185687-20180524110254.patch (text/plain), 2.44 KB, created by Brent Fulgham on 2018-05-24 11:02:54 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brent Fulgham

Created: 2018-05-24 11:02:54 PDT

Size: 2.44 KB

patch

obsolete

>Subversion Revision: 232122
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 28edc121fb15a8f0eb2d55a69bcdbd5d0cc360e3..f5585ab61a8fdc1db20ca4fdd4961d92c37887af 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,26 @@
>+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 NOBODY (OOPS!).
>+
>+        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-23  Youenn Fablet  <youenn@apple.com>
> 
>         NetworkLoadChecker should check cached redirections
>diff --git a/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm b/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm
>index 24c79ecdafad35855de88d118a549c5a74485798..8dafb13b511c1cd6c7297a09443c3aea630c9d21 100644
>--- a/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm
>+++ b/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm
>@@ -215,7 +215,7 @@ void ProcessLauncher::launchProcess()
> #ifndef _NDEBUG
>         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
> 
>         // We failed to launch. Release the send right.
>@@ -252,7 +252,7 @@ void ProcessLauncher::launchProcess()
> #ifndef _NDEBUG
>             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
> 
>             deallocateSendRightSafely(listeningPort);

Actions: View | Formatted Diff | Diff

Attachments on bug 185687: 341209