Merge pull request #34 from erikdubbelboer/recvrace

Fix race for recvBuf
hashicorp · Jul 20, 2016 · d1caa6c · d1caa6c
2 parents d2be601 + f30b49b
commit d1caa6c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/stream.go b/stream.go
@@ -91,10 +91,13 @@ START:
 	case streamRemoteClose:
 		fallthrough
 	case streamClosed:
+		s.recvLock.Lock()
 		if s.recvBuf == nil || s.recvBuf.Len() == 0 {
+			s.recvLock.Unlock()
 			s.stateLock.Unlock()
 			return 0, io.EOF
 		}
+		s.recvLock.Unlock()
 	case streamReset:
 		s.stateLock.Unlock()
 		return 0, ErrConnectionReset