Merge pull request ARMmbed#25 from moogle19/fix_goroutine_leak

Fix goroutine leak in linux att server
jacobrosenthal · Jan 5, 2017 · 4eb2faa · 4eb2faa
2 parents b01eb98 + b800277
commit 4eb2faa
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/linux/att/server.go b/linux/att/server.go
@@ -104,7 +104,7 @@ func (s *Server) indicate(h uint16, data []byte) (int, error) {
 		return n, err
 	}
 	select {
-	case ok := <-s.chConfirm:
+	case _, ok := <-s.chConfirm:
 		if !ok {
 			return 0, io.ErrClosedPipe
 		}
@@ -131,7 +131,8 @@ func (s *Server) Loop() {
 			n, err := s.conn.Read(b.buf)
 			if n == 0 || err != nil {
 				close(seq)
-				s.close()
+				close(s.chConfirm)
+				_ = s.conn.Close()
 				return
 			}
 			if b.buf[0] == HandleValueConfirmationCode {
@@ -168,11 +169,6 @@ func (s *Server) Loop() {
 	}
 }
 
-func (s *Server) close() error {
-	s.chConfirm <- false
-	return s.conn.Close()
-}
-
 func (s *Server) handleRequest(b []byte) []byte {
 	var resp []byte
 	logger.Debug("server", "req", fmt.Sprintf("% X", b))