content/browser/web_contents/navigation_controller_impl.cc - Issue 23978003: Delete unneeded pending entries in DidFailProvisionalLoad to prevent a spoof.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/web_contents/navigation_controller_impl.cc

Issue 23978003: Delete unneeded pending entries in DidFailProvisionalLoad to prevent a spoof. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Only clear the pending entry, not the transient. Created 7 years, 3 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 | « content/browser/web_contents/navigation_controller_impl.h ('k') | content/browser/web_contents/navigation_controller_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/navigation_controller_impl.cc

diff --git a/content/browser/web_contents/navigation_controller_impl.cc b/content/browser/web_contents/navigation_controller_impl.cc

index c8da80563404ad4aed6631c9a5dc59996dcba972..67f820773373ed71892d44b4df096c7ac8c106f3 100644

--- a/content/browser/web_contents/navigation_controller_impl.cc

+++ b/content/browser/web_contents/navigation_controller_impl.cc

@@ -1623,12 +1623,15 @@ void NavigationControllerImpl::FinishRestore(int selected_index,

}

void NavigationControllerImpl::DiscardNonCommittedEntriesInternal() {

+ DiscardPendingEntry();

+ DiscardTransientEntry();

+void NavigationControllerImpl::DiscardPendingEntry() {

if (pending_entry_index_ == -1)

delete pending_entry_;

pending_entry_ = NULL;

pending_entry_index_ = -1;

- DiscardTransientEntry();

}

void NavigationControllerImpl::DiscardTransientEntry() {