Title: [153839] trunk/Source/WebKit2
- Revision
- 153839
- Author
- a...@apple.com
- Date
- 2013-08-08 12:22:31 -0700 (Thu, 08 Aug 2013)
Log Message
WKBundleFrameCopyProvisionalURL crashes when there is no provisional loader
https://bugs.webkit.org/show_bug.cgi?id=119587
Reviewed by Darin Adler.
* WebProcess/WebPage/WebFrame.cpp: (WebKit::WebFrame::provisionalURL): Added a null
check, like we already have in WebFrame::url().
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (153838 => 153839)
--- trunk/Source/WebKit2/ChangeLog 2013-08-08 19:17:47 UTC (rev 153838)
+++ trunk/Source/WebKit2/ChangeLog 2013-08-08 19:22:31 UTC (rev 153839)
@@ -1,3 +1,13 @@
+2013-08-08 Alexey Proskuryakov <a...@apple.com>
+
+ WKBundleFrameCopyProvisionalURL crashes when there is no provisional loader
+ https://bugs.webkit.org/show_bug.cgi?id=119587
+
+ Reviewed by Darin Adler.
+
+ * WebProcess/WebPage/WebFrame.cpp: (WebKit::WebFrame::provisionalURL): Added a null
+ check, like we already have in WebFrame::url().
+
2013-08-07 Antti Koivisto <an...@apple.com>
Try to fix EFL build.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (153838 => 153839)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2013-08-08 19:17:47 UTC (rev 153838)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2013-08-08 19:22:31 UTC (rev 153839)
@@ -681,7 +681,11 @@
if (!m_coreFrame)
return String();
- return m_coreFrame->loader()->provisionalDocumentLoader()->url().string();
+ DocumentLoader* provisionalDocumentLoader = m_coreFrame->loader()->provisionalDocumentLoader();
+ if (!provisionalDocumentLoader)
+ return String();
+
+ return provisionalDocumentLoader->url().string();
}
String WebFrame::suggestedFilenameForResourceWithURL(const KURL& url) const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
