Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(854)

Unified Diff: Source/core/frame/DOMWindow.cpp

Issue 203493005: Add more checks to prevent crashes when accessing name/opener properties (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase results Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/frame/DOMWindow.cpp
diff --git a/Source/core/frame/DOMWindow.cpp b/Source/core/frame/DOMWindow.cpp
index baf8eceda6e3b61a156b2385f53baa8e1ac93927..a9c7d4dbf82096893986cf498a685d28b312a72e 100644
--- a/Source/core/frame/DOMWindow.cpp
+++ b/Source/core/frame/DOMWindow.cpp
@@ -1189,7 +1189,7 @@ unsigned DOMWindow::length() const
const AtomicString& DOMWindow::name() const
{
- if (!m_frame)
+ if (!isCurrentlyDisplayedInFrame())
return nullAtom;
return m_frame->tree().name();
@@ -1197,10 +1197,11 @@ const AtomicString& DOMWindow::name() const
void DOMWindow::setName(const AtomicString& name)
{
- if (!m_frame)
+ if (!isCurrentlyDisplayedInFrame())
return;
m_frame->tree().setName(name);
+ ASSERT(m_frame->loader().client());
m_frame->loader().client()->didChangeName(name);
}
« no previous file with comments | « LayoutTests/fast/dom/Window/name-and-opener-on-detached-window-expected.txt ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698