Attachment 358512 Details for Bug 193204 – [PATCH] Proposed Fix

[patch] [PATCH] Proposed Fix

proposed-fix-1.patch (text/plain), 2.36 KB, created by Joseph Pecoraro on 2019-01-07 12:22:20 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Pecoraro

Created: 2019-01-07 12:22:20 PST

Size: 2.36 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 707b781a0b2..778a6f6d5f4 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-01-07  Joseph Pecoraro  <pecoraro@apple.com>
>+
>+        Web Inspector: Remote inspector can crash if attempting to navigate inspector page
>+        https://bugs.webkit.org/show_bug.cgi?id=193204
>+        <rdar://problem/45550428>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/mac/RemoteWebInspectorProxyMac.mm:
>+        (WebKit::RemoteWebInspectorProxy::platformCreateFrontendPageAndWindow):
>+        * UIProcess/mac/WKInspectorViewController.mm:
>+        (-[WKInspectorViewController webView:decidePolicyForNavigationAction:decisionHandler:]):
>+
> 2019-01-04  Joseph Pecoraro  <pecoraro@apple.com>
> 
>         [Cocoa] Add SPI to check if a WKWebView has an inspector frontend
>diff --git a/Source/WebKit/UIProcess/mac/RemoteWebInspectorProxyMac.mm b/Source/WebKit/UIProcess/mac/RemoteWebInspectorProxyMac.mm
>index caee26bdc22..ebd6a391643 100644
>--- a/Source/WebKit/UIProcess/mac/RemoteWebInspectorProxyMac.mm
>+++ b/Source/WebKit/UIProcess/mac/RemoteWebInspectorProxyMac.mm
>@@ -85,7 +85,7 @@ WebPageProxy* RemoteWebInspectorProxy::platformCreateFrontendPageAndWindow()
> {
>     m_objCAdapter = adoptNS([[WKRemoteWebInspectorProxyObjCAdapter alloc] initWithRemoteWebInspectorProxy:this]);
> 
>-    m_inspectorView = adoptNS([[WKInspectorViewController alloc] initWithInspectedPage:nil]);
>+    m_inspectorView = adoptNS([[WKInspectorViewController alloc] initWithInspectedPage:nullptr]);
>     [m_inspectorView.get() setDelegate:m_objCAdapter.get()];
> 
>     m_window = WebInspectorProxy::createFrontendWindow(NSZeroRect);
>diff --git a/Source/WebKit/UIProcess/mac/WKInspectorViewController.mm b/Source/WebKit/UIProcess/mac/WKInspectorViewController.mm
>index c531ddf48d0..6cb6c2af77d 100644
>--- a/Source/WebKit/UIProcess/mac/WKInspectorViewController.mm
>+++ b/Source/WebKit/UIProcess/mac/WKInspectorViewController.mm
>@@ -226,7 +226,8 @@ - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigati
>     decisionHandler(WKNavigationActionPolicyCancel);
>     
>     // And instead load it in the inspected page.
>-    _inspectedPage->loadRequest(navigationAction.request);
>+    if (_inspectedPage)
>+        _inspectedPage->loadRequest(navigationAction.request);
> }
> 
> // MARK: WKInspectorWKWebViewDelegate methods

Actions: View | Formatted Diff | Diff

Attachments on bug 193204: 358512