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

Unified Diff: Source/core/loader/FrameLoader.cpp

Issue 307223002: Make sure we never pass a null Frame to Document::canNavigate() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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
« Source/core/frame/Frame.h ('K') | « Source/core/frame/History.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/FrameLoader.cpp
diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
index 944aa686aa7f72da7ec084eab004641cb5c217ba..f8db9cb767fe52ba152ca6fa987cf1a483974d03 100644
--- a/Source/core/loader/FrameLoader.cpp
+++ b/Source/core/loader/FrameLoader.cpp
@@ -1386,7 +1386,7 @@ LocalFrame* FrameLoader::findFrameForNavigation(const AtomicString& name, Docume
{
ASSERT(activeDocument);
LocalFrame* frame = m_frame->tree().find(name);
- if (!activeDocument->canNavigate(frame))
+ if (!frame || !activeDocument->canNavigate(*frame))
eseidel 2014/06/02 05:19:29 So this is the magic to fix the layout test?
Inactive 2014/06/02 12:16:37 No, I did not do anything to fix the layout test.
return 0;
return frame;
}
« Source/core/frame/Frame.h ('K') | « Source/core/frame/History.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698