Fix potential panic in conn.Close

keimoon · keimoon · commit d7383af0fd0f · 2014-07-04T17:20:07.000+07:00
diff --git a/conn.go b/conn.go
@@ -70,7 +70,7 @@ func (c *Conn) Close() error {
 	c.mutex.Lock()
 	defer c.mutex.Unlock()
 	c.isClosed = true
-	if c.state == connStateNotConnected {
+	if c.state == connStateNotConnected || c.tcpConn == nil {
 		return nil
 	}
 	c.state = connStateNotConnected

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func (c *Conn) Close() error {`
`70`	`70`	`c.mutex.Lock()`
`71`	`71`	`defer c.mutex.Unlock()`
`72`	`72`	`c.isClosed = true`
`73`		`- if c.state == connStateNotConnected {`
	`73`	`+ if c.state == connStateNotConnected \|\| c.tcpConn == nil {`
`74`	`74`	`return nil`
`75`	`75`	`}`
`76`	`76`	`c.state = connStateNotConnected`