Merge pull request #53 from getlantern/smux-issue-52

Always stop timer in Stream.Read
xtaci · Jul 10, 2019 · 67e00e8 · 67e00e8
2 parents 79b3c96 + e7738d0
commit 67e00e8
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/stream.go b/stream.go
@@ -84,14 +84,13 @@ func (s *Stream) Read(b []byte) (n int, err error) {
 		var deadline <-chan time.Time
 		if d, ok := s.readDeadline.Load().(time.Time); ok && !d.IsZero() {
 			timer = time.NewTimer(time.Until(d))
+			defer timer.Stop()
 			deadline = timer.C
 		}
 
 		select {
 		case <-s.chReadEvent:
-			if timer != nil {
-				timer.Stop()
-			}
+			continue
 		case <-s.chFinEvent:
 			return 0, errors.WithStack(io.EOF)
 		case <-s.sess.chSocketReadError: