Title: [191090] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 191090
- Author
- matthew_han...@apple.com
- Date
- 2015-10-14 23:46:24 -0700 (Wed, 14 Oct 2015)
Log Message
Merge r188531. rdar://problem/22707497
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (191089 => 191090)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-15 06:46:22 UTC (rev 191089)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-15 06:46:24 UTC (rev 191090)
@@ -1,5 +1,22 @@
2015-10-14 Matthew Hanson <matthew_han...@apple.com>
+ Merge r188531. rdar://problem/22707497
+
+ 2015-08-17 Andy Estes <aes...@apple.com>
+
+ REGRESSION (r188486): Crash in SubresourceLoader::didReceiveResponse() when TemporaryChange goes out of scope
+ https://bugs.webkit.org/show_bug.cgi?id=148082
+
+ Reviewed by Alexey Proskuryakov.
+
+ Covered by existing tests run under ASan or Guard Malloc.
+
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::didReceiveResponse): Ensure that callingDidReceiveResponse is destroyed while the
+ SubresourceLoader is still alive by declaring it after protect.
+
+2015-10-14 Matthew Hanson <matthew_han...@apple.com>
+
Merge r188486. rdar://problem/22707497
2015-08-13 Andy Estes <aes...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.cpp (191089 => 191090)
--- branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.cpp 2015-10-15 06:46:22 UTC (rev 191089)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/SubresourceLoader.cpp 2015-10-15 06:46:24 UTC (rev 191090)
@@ -203,12 +203,12 @@
ASSERT(!response.isNull());
ASSERT(m_state == Initialized);
- TemporaryChange<bool> callingDidReceiveResponse(m_callingDidReceiveResponse, true);
-
// Reference the object in this method since the additional processing can do
// anything including removing the last reference to this object; one example of this is 3266216.
Ref<SubresourceLoader> protect(*this);
+ TemporaryChange<bool> callingDidReceiveResponse(m_callingDidReceiveResponse, true);
+
if (shouldIncludeCertificateInfo())
response.includeCertificateInfo();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
