Title: [280229] releases/WebKitGTK/webkit-2.32/Source/WebCore
- Revision
- 280229
- Author
- [email protected]
- Date
- 2021-07-23 01:29:54 -0700 (Fri, 23 Jul 2021)
Log Message
Merge r276206 - Perform port blocking earlier in the load
https://bugs.webkit.org/show_bug.cgi?id=224525
<rdar://problem/75440591>
Unreviewed follow-up (suggested by David Kilzer)
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::willSendRequest): Restore an m_frame nullptr check.,
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (280228 => 280229)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-07-23 08:29:50 UTC (rev 280228)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-07-23 08:29:54 UTC (rev 280229)
@@ -1,3 +1,14 @@
+2021-04-17 Brent Fulgham <[email protected]>
+
+ Perform port blocking earlier in the load
+ https://bugs.webkit.org/show_bug.cgi?id=224525
+ <rdar://problem/75440591>
+
+ Unreviewed follow-up (suggested by David Kilzer)
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::willSendRequest): Restore an m_frame nullptr check.,
+
2021-04-16 Brent Fulgham <[email protected]>
Perform port blocking earlier in the load
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/loader/DocumentLoader.cpp (280228 => 280229)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/loader/DocumentLoader.cpp 2021-07-23 08:29:50 UTC (rev 280228)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/loader/DocumentLoader.cpp 2021-07-23 08:29:54 UTC (rev 280229)
@@ -633,7 +633,8 @@
}
if (!portAllowed(newRequest.url())) {
RELEASE_LOG_IF_ALLOWED("willSendRequest: canceling - redirecting to a URL with a blocked port");
- FrameLoader::reportBlockedLoadFailed(*m_frame, newRequest.url());
+ if (m_frame)
+ FrameLoader::reportBlockedLoadFailed(*m_frame, newRequest.url());
cancelMainResourceLoad(frameLoader()->blockedError(newRequest));
return completionHandler(WTFMove(newRequest));
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
