Merge pull request #6 from wnke/master

Fix deadlock when reading and writer is closed.
acomagu · Jun 5, 2021 · cd7a5f7 · cd7a5f7
2 parents 2cfa345 + d05316d
commit cd7a5f7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/bufpipe.go b/bufpipe.go
@@ -124,5 +124,6 @@ func (w *PipeWriter) CloseWithError(err error) error {
 		err = io.EOF
 	}
 	w.rerr = err
+	w.cond.Broadcast()
 	return nil
 }
diff --git a/bufpipe_test.go b/bufpipe_test.go
@@ -128,3 +128,20 @@ func TestPipeReader_CloseWithError(t *testing.T) {
 	is.Equal(err, expect)
 	is.Equal(n, 0)
 }
+
+func TestPipeReader_WriterCloseNoDeadlock(t *testing.T) {
+	r, w := bufpipe.New(nil)
+
+	done := make(chan struct{})
+	go func(t *testing.T) {
+		buf := make([]byte, 800)
+		r.Read(buf)
+		done <- struct{}{}
+	}(t)
+
+	time.Sleep(300 * time.Millisecond)
+	w.Close()
+
+	<-done
+}
+