Changeset 276206 in webkit

Timestamp:

Apr 17, 2021, 1:59:39 PM (5 years ago)

Author:

Brent Fulgham

Message:

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.,

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-17  Brent Fulgham  <bfulgham@apple.com>
+
+        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-17  Basuke Suzuki  <basuke.suzuki@sony.com>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -633 +633 @@
         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));