Title: [187771] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 187771
- Author
- [email protected]
- Date
- 2015-08-03 14:49:34 -0700 (Mon, 03 Aug 2015)
Log Message
Merge r187740. rdar://problem/22098457
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (187770 => 187771)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-03 21:49:32 UTC (rev 187770)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-03 21:49:34 UTC (rev 187771)
@@ -1,5 +1,19 @@
2015-08-03 Matthew Hanson <[email protected]>
+ Merge r187740. rdar://problem/22098457
+
+ 2015-08-03 Brady Eidson <[email protected]>
+
+ 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 Matthew Hanson <[email protected]>
+
Merge r187466. rdar://problem/21960398
2015-07-27 Brady Eidson <[email protected]>
Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp (187770 => 187771)
--- branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp 2015-08-03 21:49:32 UTC (rev 187770)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp 2015-08-03 21:49:34 UTC (rev 187771)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
