Changeset 206224 in webkit

Timestamp:

Sep 21, 2016 11:41:07 AM (8 years ago)

Author:

Chris Dumez

Message:

New DocumentLoader logging causes crashes
​https://bugs.webkit.org/show_bug.cgi?id=162348
<rdar://problem/28404744>

Patch by Keith Rollin <Keith Rollin> on 2016-09-21
Reviewed by Chris Dumez

Check for NULL m_frame before using it.

No new tests -- no tests for logging, though this issue was found by
contentfiltering/block-after-will-send-request-then-allow-unblock.html

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::startLoadingMainResource):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-21  Keith Rollin  <krollin@apple.com>
+
+        New DocumentLoader logging causes crashes
+        https://bugs.webkit.org/show_bug.cgi?id=162348
+        <rdar://problem/28404744>
+
+        Reviewed by Chris Dumez
+
+        Check for NULL m_frame before using it.
+
+        No new tests -- no tests for logging, though this issue was found by
+        contentfiltering/block-after-will-send-request-then-allow-unblock.html
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::startLoadingMainResource):
+
 2016-09-21  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -1475 +1475 @@
 
     if (maybeLoadEmpty()) {
-        RELEASE_LOG_IF_ALLOWED("startLoadingMainResource: Returning empty document (frame = %p, main = %d)", m_frame, m_frame->isMainFrame());
+        RELEASE_LOG_IF_ALLOWED("startLoadingMainResource: Returning empty document (frame = %p, main = %d)", m_frame, m_frame ? m_frame->isMainFrame() : false);
         return;
     }
@@ -1497 +1497 @@
     // willSendRequest() may lead to our Frame being detached or cancelling the load via nulling the ResourceRequest.
     if (!m_frame || m_request.isNull()) {
-        RELEASE_LOG_IF_ALLOWED("startLoadingMainResource: Load canceled after willSendRequest (frame = %p, main = %d)", m_frame, m_frame->isMainFrame());
+        RELEASE_LOG_IF_ALLOWED("startLoadingMainResource: Load canceled after willSendRequest (frame = %p, main = %d)", m_frame, m_frame ? m_frame->isMainFrame() : false);
         return;
     }