diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2019-05-14 14:56:26 +0000 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2019-05-14 15:20:18 +0000 |
| commit | 40b433e6fb42f278943176269de549bf3e40faf0 (patch) | |
| tree | d80441e327f8e4b26aa70632c7fc8b006bcac2cd /src | |
| parent | 1956b28ae3cf5e75fd8ad193d3ceec183581844b (diff) | |
| download | go-40b433e6fb42f278943176269de549bf3e40faf0.tar.xz | |
net: check for canceled context before starting Windows DNS lookup
Fixes #31950
Change-Id: Id9bcd51a8b49523eeecbd0d8d527372a0b8d8760
Reviewed-on: https://go-review.googlesource.com/c/go/+/177038
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/lookup_windows.go | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/net/lookup_windows.go b/src/net/lookup_windows.go index 5ebd4b7853..d7b28f5e18 100644 --- a/src/net/lookup_windows.go +++ b/src/net/lookup_windows.go @@ -138,11 +138,14 @@ func (r *Resolver) lookupIP(ctx context.Context, network, name string) ([]IPAddr err error } - ch := make(chan ret, 1) - go func() { - addr, err := getaddr() - ch <- ret{addrs: addr, err: err} - }() + var ch chan ret + if ctx.Err() == nil { + ch = make(chan ret, 1) + go func() { + addr, err := getaddr() + ch <- ret{addrs: addr, err: err} + }() + } select { case r := <-ch: |