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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2783743002: Fix nullptr deref in maybeRenderFallbackContent() (Closed)
Patch Set: Fix tests, handled the non-loading cause in the maybeRenderFallbackContent() if block Created 3 years, 8 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 12061f72a43b7fd2785afab72ff4b29e7c7bb676..de6cb30d0c00860ed0ad0ebd7519fd61546b1110 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -5268,7 +5268,15 @@ void RenderFrameImpl::OnFailedNavigation(
// On load failure, a frame can ask its owner to render fallback content.
// When that happens, don't load an error page.
+ bool was_loading = !frame_->isLoading();
arthursonzogni 2017/04/05 07:53:34 This is wrong here. You meant: bool was_loading =
Nate Chapin 2017/04/11 18:39:00 Done.
if (frame_->maybeRenderFallbackContent(error)) {
+ // If the frame wasn't loading but was fallback-elligible, the fallback
+ // content won't be shown. However, showing an error page isn't right
+ // either, as the frame has already been populated with something unrelated
+ // to this navigation failure. In that case, just send a stop IPC to the
+ // browser to unwind its state, and leave the frame as-is.
+ if (!was_loading)
+ Send(new FrameHostMsg_DidStopLoading(routing_id_));
browser_side_navigation_pending_ = false;
return;
}
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698