Title: [227804] branches/safari-605-branch/Source/WebCore
- Revision
- 227804
- Author
- [email protected]
- Date
- 2018-01-30 10:50:07 -0800 (Tue, 30 Jan 2018)
Log Message
Cherry-pick r227632. rdar://problem/37019496
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (227803 => 227804)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-30 18:50:02 UTC (rev 227803)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-30 18:50:07 UTC (rev 227804)
@@ -1,5 +1,22 @@
2018-01-30 Jason Marcell <[email protected]>
+ Cherry-pick r227632. rdar://problem/37019496
+
+ 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-30 Jason Marcell <[email protected]>
+
Cherry-pick r227631. rdar://problem/37019444
2018-01-25 Jer Noble <[email protected]>
Modified: branches/safari-605-branch/Source/WebCore/loader/ResourceLoadObserver.cpp (227803 => 227804)
--- branches/safari-605-branch/Source/WebCore/loader/ResourceLoadObserver.cpp 2018-01-30 18:50:02 UTC (rev 227803)
+++ branches/safari-605-branch/Source/WebCore/loader/ResourceLoadObserver.cpp 2018-01-30 18:50:07 UTC (rev 227804)
@@ -362,7 +362,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
