diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-09 21:53:49 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-09 21:53:49 +0800 |
| commit | 365576620a8230a193570e81e7f296d17b13fede (patch) | |
| tree | ef7fe2a68ef0b112b7a1eff7d3ac4d27716b9256 /p2p | |
| parent | 60b780c21b861766b06b2990b7bb8c41fd6d25f8 (diff) | |
| parent | ebf2aabd254a4e765b68cdb46b18806fa7e4cb4b (diff) | |
| download | go-tangerine-365576620a8230a193570e81e7f296d17b13fede.tar go-tangerine-365576620a8230a193570e81e7f296d17b13fede.tar.gz go-tangerine-365576620a8230a193570e81e7f296d17b13fede.tar.bz2 go-tangerine-365576620a8230a193570e81e7f296d17b13fede.tar.lz go-tangerine-365576620a8230a193570e81e7f296d17b13fede.tar.xz go-tangerine-365576620a8230a193570e81e7f296d17b13fede.tar.zst go-tangerine-365576620a8230a193570e81e7f296d17b13fede.zip | |
Merge pull request #1216 from karalabe/fix-eth-dataraces
Fix various data races in eth and core
Diffstat (limited to 'p2p')
| -rw-r--r-- | p2p/rlpx.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/p2p/rlpx.go b/p2p/rlpx.go index e1cb13aae..6bbf20671 100644 --- a/p2p/rlpx.go +++ b/p2p/rlpx.go @@ -102,6 +102,7 @@ func (t *rlpx) doProtoHandshake(our *protoHandshake) (their *protoHandshake, err werr := make(chan error, 1) go func() { werr <- Send(t.rw, handshakeMsg, our) }() if their, err = readProtocolHandshake(t.rw, our); err != nil { + <-werr // make sure the write terminates too return nil, err } if err := <-werr; err != nil { |