net/base/single_request_host_resolver.cc - Issue 7492059: HostResolver: don't interpret NULL callback argument as a request to do synchronous resolution.

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/base/single_request_host_resolver.cc

Issue 7492059: HostResolver: don't interpret NULL callback argument as a request to do synchronous resolution. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merged common code from Resolve and ResolveFromCache to a single function. Created 9 years, 4 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: net/base/single_request_host_resolver.cc

diff --git a/net/base/single_request_host_resolver.cc b/net/base/single_request_host_resolver.cc

index d3f77589b358b194adc1939d96ae9da49fd7cede..ced4801d0e5d59d6e661b855de75dbac194dd09f 100644

--- a/net/base/single_request_host_resolver.cc

+++ b/net/base/single_request_host_resolver.cc

@@ -27,6 +27,8 @@ int SingleRequestHostResolver::Resolve(const HostResolver::RequestInfo& info,

AddressList* addresses,

CompletionCallback* callback,

const BoundNetLog& net_log) {

+ DCHECK(addresses);

+ DCHECK(callback);

DCHECK(!cur_request_callback_) << "resolver already in use";

HostResolver::RequestHandle request = NULL;

« net/base/host_resolver_impl.cc ('K') | « net/base/net_error_list.h ('k') | net/base/single_request_host_resolver_unittest.cc » ('j') | no next file with comments »