Title: [265158] trunk/Source/WebKit
Revision
265158
Author
[email protected]
Date
2020-07-31 13:39:04 -0700 (Fri, 31 Jul 2020)

Log Message

SOAuthorizationSession::dismissViewController could crash on calling WebPageProxy::platformWindow
https://bugs.webkit.org/show_bug.cgi?id=214816
<rdar://problem/65681530>

Reviewed by Youenn Fablet.

pageClient() called in WebPageProxy::platformWindow() could be null. Therefore, platformWindow()
needs to check m_pageClient instead.

* UIProcess/mac/WebPageProxyMac.mm:
(WebKit::WebPageProxy::platformWindow):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (265157 => 265158)


--- trunk/Source/WebKit/ChangeLog	2020-07-31 20:19:02 UTC (rev 265157)
+++ trunk/Source/WebKit/ChangeLog	2020-07-31 20:39:04 UTC (rev 265158)
@@ -1,3 +1,17 @@
+2020-07-31  Jiewen Tan  <[email protected]>
+
+        SOAuthorizationSession::dismissViewController could crash on calling WebPageProxy::platformWindow
+        https://bugs.webkit.org/show_bug.cgi?id=214816
+        <rdar://problem/65681530>
+
+        Reviewed by Youenn Fablet.
+
+        pageClient() called in WebPageProxy::platformWindow() could be null. Therefore, platformWindow()
+        needs to check m_pageClient instead.
+
+        * UIProcess/mac/WebPageProxyMac.mm:
+        (WebKit::WebPageProxy::platformWindow):
+
 2020-07-31  Youenn Fablet  <[email protected]>
 
         Update service worker if certificate info does not match when soft updating

Modified: trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm (265157 => 265158)


--- trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm	2020-07-31 20:19:02 UTC (rev 265157)
+++ trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm	2020-07-31 20:39:04 UTC (rev 265158)
@@ -625,7 +625,7 @@
 
 NSWindow *WebPageProxy::platformWindow()
 {
-    return pageClient().platformWindow();
+    return m_pageClient ? m_pageClient->platformWindow() : nullptr;
 }
 
 void WebPageProxy::rootViewToWindow(const WebCore::IntRect& viewRect, WebCore::IntRect& windowRect)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to