net/proxy/init_proxy_resolver.cc - Issue 7044058: Cancel when InitProxyResolver cancels, so we don't use callback later.

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: net/proxy/init_proxy_resolver.cc

Issue 7044058: Cancel when InitProxyResolver cancels, so we don't use callback later. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add regression test, and fix NULL check (caught by existing test). Created 9 years, 6 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:

Index: net/proxy/init_proxy_resolver.cc

diff --git a/net/proxy/init_proxy_resolver.cc b/net/proxy/init_proxy_resolver.cc

index 52c542113a4fccae7b5c47f55716da8d1be1b2f7..d2983b650543694ada3bbbc4b6a2a61664e2d861 100644

--- a/net/proxy/init_proxy_resolver.cc

+++ b/net/proxy/init_proxy_resolver.cc

@@ -371,6 +371,10 @@ void InitProxyResolver::Cancel() {

break;

}

+ // This is safe to call in any state.

+ if (dhcp_proxy_script_fetcher_)

+ dhcp_proxy_script_fetcher_->Cancel();

DidCompleteInit();

}