Title: [105767] branches/safari-534.54-branch/Source/WebCore
Revision
105767
Author
[email protected]
Date
2012-01-24 11:43:07 -0800 (Tue, 24 Jan 2012)

Log Message

Merged r105556.

Modified Paths

Diff

Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (105766 => 105767)


--- branches/safari-534.54-branch/Source/WebCore/ChangeLog	2012-01-24 19:40:27 UTC (rev 105766)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog	2012-01-24 19:43:07 UTC (rev 105767)
@@ -1,3 +1,19 @@
+2011-01-24  Lucas Forschler  <[email protected]>
+
+    Merge 105556
+
+    2012-01-20  Brady Eidson  <[email protected]>
+
+            <rdar://problem/9328684> and https://bugs.webkit.org/show_bug.cgi?id=62764
+            Frequent crashes due to null frame below ApplicationCacheHost::scheduleLoadFallbackResourceFromApplicationCache
+
+            Reviewed by Sam Weinig.
+
+            No way to reproduce without special malloc debugging and that doesn't even reproduce on all platforms.  So still no test.
+
+            * loader/DocumentLoader.cpp:
+            (WebCore::DocumentLoader::detachFromFrame): Protect m_frame for the duration of this method.
+
 2011-01-18  Lucas Forschler  <[email protected]>
 
     Merge 95580

Modified: branches/safari-534.54-branch/Source/WebCore/loader/DocumentLoader.cpp (105766 => 105767)


--- branches/safari-534.54-branch/Source/WebCore/loader/DocumentLoader.cpp	2012-01-24 19:40:27 UTC (rev 105766)
+++ branches/safari-534.54-branch/Source/WebCore/loader/DocumentLoader.cpp	2012-01-24 19:43:07 UTC (rev 105767)
@@ -409,6 +409,7 @@
 void DocumentLoader::detachFromFrame()
 {
     ASSERT(m_frame);
+    RefPtr<Frame> protector(m_frame);
 
     // It never makes sense to have a document loader that is detached from its
     // frame have any loads active, so go ahead and kill all the loads.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to