Title: [206224] trunk/Source/WebCore
- Revision
- 206224
- Author
- cdu...@apple.com
- Date
- 2016-09-21 11:41:07 -0700 (Wed, 21 Sep 2016)
Log Message
New DocumentLoader logging causes crashes
https://bugs.webkit.org/show_bug.cgi?id=162348
<rdar://problem/28404744>
Patch by Keith Rollin <krol...@apple.com> 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (206223 => 206224)
--- trunk/Source/WebCore/ChangeLog 2016-09-21 18:33:30 UTC (rev 206223)
+++ trunk/Source/WebCore/ChangeLog 2016-09-21 18:41:07 UTC (rev 206224)
@@ -1,3 +1,19 @@
+2016-09-21 Keith Rollin <krol...@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 <achristen...@webkit.org>
Optimize URLParser
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (206223 => 206224)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-09-21 18:33:30 UTC (rev 206223)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-09-21 18:41:07 UTC (rev 206224)
@@ -1474,7 +1474,7 @@
m_loadingMainResource = true;
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;
}
@@ -1496,7 +1496,7 @@
// 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;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
