Merge branch 'Fix_race_conditionon_EOF'

7ail · Sep 18, 2019 · 1bb02a2 · 1bb02a2
2 parents b5e15fb + 26baa44
commit 1bb02a2
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/jqpipe.go b/jqpipe.go
@@ -82,6 +82,11 @@ func (p *Pipe) Next() (json.RawMessage, error) {
 	}
 	p.stdout.Close()
 
+	if err == io.EOF {
+		p.jq.Wait()
+		return nil, err
+	}
+
 	// if we have a decoding error, jq is sick and we need to kill it with fire..
 	if err != io.EOF {
 		p.Close()