Attachment 341557 Details for Bug 186081 – Patch

[patch] Patch

bug-186081-20180529212558.patch (text/plain), 1.69 KB, created by Brent Fulgham on 2018-05-29 21:25:59 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brent Fulgham

Created: 2018-05-29 21:25:59 PDT

Size: 1.69 KB

patch

obsolete

>Subversion Revision: 232274
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 06db959ebf4119790b56c71b9b5e283837eaf8f0..6461517ac0cf06d1e178b1ba035210d6163a279a 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-05-29  Brent Fulgham  <bfulgham@apple.com>
>+
>+        REGRESSION(r216119): DocumentLoader::detachFromFrame still encounters nullptr frame
>+        https://bugs.webkit.org/show_bug.cgi?id=186081
>+        <rdar://problem/34918109>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Revive the nullptr check that was removed in r216119 since crash data indicates that
>+        it is still possible to have a nullptr m_frame in this method.
>+
>+        * loader/DocumentLoader.cpp:
>+        (WebCore::DocumentLoader::detachFromFrame):
>+
> 2018-05-29  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         iOS WK1: Occasional crash in sanitizedMarkupForFragmentInDocument
>diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp
>index 7ed4f64c921181e48af9bd603259eed55d1b883a..3cc2661a50f6e018d4fb07432747fb556b21325d 100644
>--- a/Source/WebCore/loader/DocumentLoader.cpp
>+++ b/Source/WebCore/loader/DocumentLoader.cpp
>@@ -1183,9 +1183,16 @@ void DocumentLoader::detachFromFrame()
> 
>     m_applicationCacheHost->setDOMApplicationCache(nullptr);
> 
>+    ASSERT(m_frame);
>+    ASSERT(m_frame && m_frame->refCount() >= 1);
>+
>     cancelPolicyCheckIfNeeded();
> 
>-    InspectorInstrumentation::loaderDetachedFromFrame(*m_frame, *this);
>+    ASSERT(m_frame);
>+    ASSERT(m_frame && m_frame->refCount() >= 1);
>+
>+    if (m_frame)
>+        InspectorInstrumentation::loaderDetachedFromFrame(*m_frame, *this);
> 
>     observeFrame(nullptr);
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 186081: 341557 | 341610 | 341686