Title: [187740] trunk/Source/WebCore
- Revision
- 187740
- Author
- beid...@apple.com
- Date
- 2015-08-03 10:06:38 -0700 (Mon, 03 Aug 2015)
Log Message
Crash when signing into twitter calling WebCore::DocumentLoader::responseReceived(WebCore::CachedResource*, WebCore::ResourceResponse const&).
<rdar://problem/22098457> and https://bugs.webkit.org/show_bug.cgi?id=147560
Reviewed by Alexey Proskuryakov.
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::willSendRequest): Only grab identifierForLoadWithoutResourceLoader() if there's no ResourceLoader.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (187739 => 187740)
--- trunk/Source/WebCore/ChangeLog 2015-08-03 16:06:45 UTC (rev 187739)
+++ trunk/Source/WebCore/ChangeLog 2015-08-03 17:06:38 UTC (rev 187740)
@@ -1,3 +1,13 @@
+2015-08-03 Brady Eidson <beid...@apple.com>
+
+ Crash when signing into twitter calling WebCore::DocumentLoader::responseReceived(WebCore::CachedResource*, WebCore::ResourceResponse const&).
+ <rdar://problem/22098457> and https://bugs.webkit.org/show_bug.cgi?id=147560
+
+ Reviewed by Alexey Proskuryakov.
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::willSendRequest): Only grab identifierForLoadWithoutResourceLoader() if there's no ResourceLoader.
+
2015-08-03 Zalan Bujtas <za...@apple.com>
themePainted in RenderBox::paintBoxDecorations() is confusing.
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (187739 => 187740)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-08-03 16:06:45 UTC (rev 187739)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-08-03 17:06:38 UTC (rev 187740)
@@ -552,7 +552,8 @@
m_applicationCacheHost->maybeLoadMainResourceForRedirect(newRequest, m_substituteData);
if (m_substituteData.isValid()) {
RELEASE_ASSERT(m_mainResource);
- m_identifierForLoadWithoutResourceLoader = m_mainResource->identifierForLoadWithoutResourceLoader();
+ ResourceLoader* loader = m_mainResource->loader();
+ m_identifierForLoadWithoutResourceLoader = loader ? loader->identifier() : m_mainResource->identifierForLoadWithoutResourceLoader();
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
