Title: [203088] trunk/Source/WebCore
- Revision
- 203088
- Author
- [email protected]
- Date
- 2016-07-11 15:35:51 -0700 (Mon, 11 Jul 2016)
Log Message
Potential null dereference under DocumentLoader::mainReceivedError()
https://bugs.webkit.org/show_bug.cgi?id=159640
<rdar://problem/27283372>
Reviewed by Brady Eidson.
Move frameLoader() null check a bit earlier in DocumentLoader::mainReceivedError()
as it was dereferenced before the check.
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::mainReceivedError):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (203087 => 203088)
--- trunk/Source/WebCore/ChangeLog 2016-07-11 22:08:40 UTC (rev 203087)
+++ trunk/Source/WebCore/ChangeLog 2016-07-11 22:35:51 UTC (rev 203088)
@@ -1,3 +1,17 @@
+2016-07-11 Chris Dumez <[email protected]>
+
+ Potential null dereference under DocumentLoader::mainReceivedError()
+ https://bugs.webkit.org/show_bug.cgi?id=159640
+ <rdar://problem/27283372>
+
+ Reviewed by Brady Eidson.
+
+ Move frameLoader() null check a bit earlier in DocumentLoader::mainReceivedError()
+ as it was dereferenced before the check.
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::mainReceivedError):
+
2016-07-11 Enrica Casucci <[email protected]>
Add synthetic click origin to WKNavigationAction.
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (203087 => 203088)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-07-11 22:08:40 UTC (rev 203087)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-07-11 22:35:51 UTC (rev 203088)
@@ -249,6 +249,9 @@
{
ASSERT(!error.isNull());
+ if (!frameLoader())
+ return;
+
if (m_identifierForLoadWithoutResourceLoader) {
ASSERT(!mainResourceLoader());
frameLoader()->client().dispatchDidFailLoading(this, m_identifierForLoadWithoutResourceLoader, error);
@@ -262,8 +265,6 @@
m_applicationCacheHost->failedLoadingMainResource();
- if (!frameLoader())
- return;
setMainDocumentError(error);
clearMainResourceLoader();
frameLoader()->receivedMainResourceError(error);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
