infinite loop concurrency bug

zricethezav · zricethezav · commit 9487daa2c83d · 2021-10-28T21:00:56.000-05:00
diff --git a/gitdiff/parser.go b/gitdiff/parser.go
@@ -27,11 +27,12 @@ func Parse(r io.Reader) (<-chan *File, error) {
 	}
 
 	go func() {
+		defer close(out)
+
 		ph := &PatchHeader{}
 		for {
 			file, pre, err := p.ParseNextFileHeader()
 			if err != nil {
-				out <- file
 				return
 			}
 
@@ -59,7 +60,6 @@ func Parse(r io.Reader) (<-chan *File, error) {
 			file.PatchHeader = ph
 			out <- file
 		}
-		close(out)
 	}()
 
 	return out, nil

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,12 @@ func Parse(r io.Reader) (<-chan *File, error) {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`go func() {`
	`30`	`+ defer close(out)`
	`31`	`+`
`30`	`32`	`ph := &PatchHeader{}`
`31`	`33`	`for {`
`32`	`34`	`file, pre, err := p.ParseNextFileHeader()`
`33`	`35`	`if err != nil {`
`34`		`- out <- file`
`35`	`36`	`return`
`36`	`37`	`}`
`37`	`38`
`@@ -59,7 +60,6 @@ func Parse(r io.Reader) (<-chan *File, error) {`
`59`	`60`	`file.PatchHeader = ph`
`60`	`61`	`out <- file`
`61`	`62`	`}`
`62`		`- close(out)`
`63`	`63`	`}()`
`64`	`64`
`65`	`65`	`return out, nil`