Title: [227632] trunk/Source/WebCore
Revision
227632
Author
[email protected]
Date
2018-01-25 14:31:18 -0800 (Thu, 25 Jan 2018)

Log Message

Make sure we have a frame as we iterate in ResourceLoadObserver::nonNullOwnerURL()
https://bugs.webkit.org/show_bug.cgi?id=182116
<rdar://problem/36210134>

Reviewed by Alex Christensen.

No new tests. No known repro case, just crash logs.

* loader/ResourceLoadObserver.cpp:
(WebCore::ResourceLoadObserver::nonNullOwnerURL const):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (227631 => 227632)


--- trunk/Source/WebCore/ChangeLog	2018-01-25 22:29:55 UTC (rev 227631)
+++ trunk/Source/WebCore/ChangeLog	2018-01-25 22:31:18 UTC (rev 227632)
@@ -1,3 +1,16 @@
+2018-01-25  John Wilander  <[email protected]>
+
+        Make sure we have a frame as we iterate in ResourceLoadObserver::nonNullOwnerURL()
+        https://bugs.webkit.org/show_bug.cgi?id=182116
+        <rdar://problem/36210134>
+
+        Reviewed by Alex Christensen.
+
+        No new tests. No known repro case, just crash logs.
+
+        * loader/ResourceLoadObserver.cpp:
+        (WebCore::ResourceLoadObserver::nonNullOwnerURL const):
+
 2018-01-25  Jer Noble  <[email protected]>
 
         Move ImageDecoderAVFObjC from using AVSampleBufferGenerator to AVAssetReaderOutput for parsing

Modified: trunk/Source/WebCore/loader/ResourceLoadObserver.cpp (227631 => 227632)


--- trunk/Source/WebCore/loader/ResourceLoadObserver.cpp	2018-01-25 22:29:55 UTC (rev 227631)
+++ trunk/Source/WebCore/loader/ResourceLoadObserver.cpp	2018-01-25 22:31:18 UTC (rev 227632)
@@ -383,7 +383,7 @@
     auto* frame = document.frame();
     auto host = document.url().host();
 
-    while ((host.isNull() || host.isEmpty()) && !frame->isMainFrame()) {
+    while ((host.isNull() || host.isEmpty()) && frame && !frame->isMainFrame()) {
         auto* ownerElement = frame->ownerElement();
 
         ASSERT(ownerElement != nullptr);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to