Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-10-14 00:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DEV-322] Backport btcsuite/btcd PR: connmanager: check Addr for nil (#131)

Browse Source 
* [DEV-322] connmanager: check Addr for nil

* [DEV-322] Added crash recovering in TestConnReqString

* [DEV-322] Fixed 'go vet' errors
This commit is contained in:
Evgeny Khirin 2018-12-26 12:38:10 +02:00 committed by stasatdaglabs
parent c45cef0ffe
commit ca084f595e
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connmgr/connmanager.go
View File

@ -89,7 +89,7 @@ func (c *ConnReq) State() ConnState {
// String returns a human-readable string for the connection request. // String returns a human-readable string for the connection request.
func (c *ConnReq) String() string { func (c *ConnReq) String() string {
if c.Addr.String() == "" { if c.Addr == nil || c.Addr.String() == "" {
return fmt.Sprintf("reqid %d", atomic.LoadUint64(&c.id)) return fmt.Sprintf("reqid %d", atomic.LoadUint64(&c.id))
} }
return fmt.Sprintf("%s (reqid %d)", c.Addr, atomic.LoadUint64(&c.id)) return fmt.Sprintf("%s (reqid %d)", c.Addr, atomic.LoadUint64(&c.id))

19
connmgr/connmanager_test.go
View File

@ -664,3 +664,22 @@ out:
cmgr.Stop() cmgr.Stop()
cmgr.Wait() cmgr.Wait()
} }
// TestConnReqString ensures that ConnReq.String() does not crash
func TestConnReqString(t *testing.T) {
defer func() {
if r := recover(); r != nil {
t.Fatalf("ConnReq.String crashed %v", r)
}
}()
cr1 := &ConnReq{
Addr: &net.TCPAddr{
IP: net.ParseIP("127.0.0.1"),
Port: 18555,
},
Permanent: true,
}
_ = cr1.String()
cr2 := &ConnReq{}
_ = cr2.String()
}