Title: [170674] trunk/Source/WebKit2
- Revision
- 170674
- Author
- m...@apple.com
- Date
- 2014-07-01 16:22:03 -0700 (Tue, 01 Jul 2014)
Log Message
Crash in WebDocumentLoader::setNavigationID
https://bugs.webkit.org/show_bug.cgi?id=134520
Reviewed by Anders Carlsson.
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::didReceivePolicyDecision): Null-check the policy document loader.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170673 => 170674)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 23:01:51 UTC (rev 170673)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 23:22:03 UTC (rev 170674)
@@ -1,5 +1,15 @@
2014-07-01 Dan Bernstein <m...@apple.com>
+ Crash in WebDocumentLoader::setNavigationID
+ https://bugs.webkit.org/show_bug.cgi?id=134520
+
+ Reviewed by Anders Carlsson.
+
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::didReceivePolicyDecision): Null-check the policy document loader.
+
+2014-07-01 Dan Bernstein <m...@apple.com>
+
Build fix.
* UIProcess/API/APILoaderClient.h:
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (170673 => 170674)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2014-07-01 23:01:51 UTC (rev 170673)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2014-07-01 23:22:03 UTC (rev 170674)
@@ -235,8 +235,8 @@
m_policyDownloadID = downloadID;
if (navigationID) {
- WebDocumentLoader& documentLoader = static_cast<WebDocumentLoader&>(*m_coreFrame->loader().policyDocumentLoader());
- documentLoader.setNavigationID(navigationID);
+ if (WebDocumentLoader* documentLoader = static_cast<WebDocumentLoader*>(m_coreFrame->loader().policyDocumentLoader()))
+ documentLoader->setNavigationID(navigationID);
}
function(action);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
