Title: [276403] branches/safari-611-branch/Source/WebCore
- Revision
- 276403
- Author
- [email protected]
- Date
- 2021-04-21 16:39:29 -0700 (Wed, 21 Apr 2021)
Log Message
Cherry-pick r276206. rdar://problem/76962916
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.,
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276206 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-611-branch/Source/WebCore/ChangeLog (276402 => 276403)
--- branches/safari-611-branch/Source/WebCore/ChangeLog 2021-04-21 23:39:26 UTC (rev 276402)
+++ branches/safari-611-branch/Source/WebCore/ChangeLog 2021-04-21 23:39:29 UTC (rev 276403)
@@ -1,5 +1,33 @@
2021-04-21 Ruben Turcios <[email protected]>
+ Cherry-pick r276206. rdar://problem/76962916
+
+ 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.,
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276206 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 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-21 Ruben Turcios <[email protected]>
+
Cherry-pick r276193. rdar://problem/76962916
Perform port blocking earlier in the load
Modified: branches/safari-611-branch/Source/WebCore/loader/DocumentLoader.cpp (276402 => 276403)
--- branches/safari-611-branch/Source/WebCore/loader/DocumentLoader.cpp 2021-04-21 23:39:26 UTC (rev 276402)
+++ branches/safari-611-branch/Source/WebCore/loader/DocumentLoader.cpp 2021-04-21 23:39:29 UTC (rev 276403)
@@ -628,7 +628,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
