Title: [210651] branches/safari-603-branch/Source/WebCore
- Revision
- 210651
- Author
- [email protected]
- Date
- 2017-01-12 08:45:36 -0800 (Thu, 12 Jan 2017)
Log Message
Merge r210508. rdar://problem/29801059
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210650 => 210651)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-12 16:45:34 UTC (rev 210650)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-12 16:45:36 UTC (rev 210651)
@@ -1,5 +1,20 @@
2017-01-12 Matthew Hanson <[email protected]>
+ Merge r210508. rdar://problem/29801059
+
+ 2017-01-09 Daniel Bates <[email protected]>
+
+ Evaluating window named element may return wrong result
+ https://bugs.webkit.org/show_bug.cgi?id=166792
+ <rdar://problem/29801059>
+
+ Reviewed by Chris Dumez.
+
+ * bindings/js/JSDOMWindowProperties.cpp:
+ (WebCore::jsDOMWindowPropertiesGetOwnPropertySlotNamedItemGetter):
+
+2017-01-12 Matthew Hanson <[email protected]>
+
Merge r210472. rdar://problem/29767412
2017-01-06 Joseph Pecoraro <[email protected]>
Modified: branches/safari-603-branch/Source/WebCore/bindings/js/JSDOMWindowProperties.cpp (210650 => 210651)
--- branches/safari-603-branch/Source/WebCore/bindings/js/JSDOMWindowProperties.cpp 2017-01-12 16:45:34 UTC (rev 210650)
+++ branches/safari-603-branch/Source/WebCore/bindings/js/JSDOMWindowProperties.cpp 2017-01-12 16:45:36 UTC (rev 210651)
@@ -50,6 +50,9 @@
return true;
}
+ if (!BindingSecurity::shouldAllowAccessToFrame(exec, &frame, ThrowSecurityError))
+ return false;
+
// FIXME: Search the whole frame hierarchy somewhere around here.
// We need to test the correct priority order.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
