Title: [187558] trunk/Source/WebCore
Revision
187558
Author
beid...@apple.com
Date
2015-07-29 14:32:58 -0700 (Wed, 29 Jul 2015)

Log Message

RELEASE_ASSERT followup to: Crash in WebCore::DocumentLoader::stopLoadingForPolicyChange.
https://bugs.webkit.org/show_bug.cgi?id=147418

Reviewed by Chris Dumez.

* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::cancelPolicyCheckIfNeeded): RELEASE_ASSERT we have a FrameLoader here.
  We want to know if we ever get here without one.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (187557 => 187558)


--- trunk/Source/WebCore/ChangeLog	2015-07-29 21:26:59 UTC (rev 187557)
+++ trunk/Source/WebCore/ChangeLog	2015-07-29 21:32:58 UTC (rev 187558)
@@ -1,5 +1,16 @@
 2015-07-29  Brady Eidson  <beid...@apple.com>
 
+        RELEASE_ASSERT followup to: Crash in WebCore::DocumentLoader::stopLoadingForPolicyChange.
+        https://bugs.webkit.org/show_bug.cgi?id=147418
+
+        Reviewed by Chris Dumez.
+        
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::cancelPolicyCheckIfNeeded): RELEASE_ASSERT we have a FrameLoader here.
+          We want to know if we ever get here without one.
+
+2015-07-29  Brady Eidson  <beid...@apple.com>
+
         Crash in WebCore::DocumentLoader::stopLoadingForPolicyChange.
         <rdar://problem/21412186> and https://bugs.webkit.org/show_bug.cgi?id=147418
 

Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (187557 => 187558)


--- trunk/Source/WebCore/loader/DocumentLoader.cpp	2015-07-29 21:26:59 UTC (rev 187557)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp	2015-07-29 21:32:58 UTC (rev 187558)
@@ -1471,7 +1471,9 @@
 
 void DocumentLoader::cancelPolicyCheckIfNeeded()
 {
-    if (m_waitingForContentPolicy && frameLoader())
+    RELEASE_ASSERT(frameLoader());
+
+    if (m_waitingForContentPolicy)
         frameLoader()->policyChecker().cancelCheck();
 
     m_waitingForContentPolicy = false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to