Merge branch 'Fix_race_conditionon_EOF'

jqpipe.go

@@ -82,11 +82,6 @@ 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()
@@ -102,7 +97,7 @@ func (p *Pipe) Next() (json.RawMessage, error) {
 		return nil, errors.New(p.stderr.String())
 	}
 
-	if p.jq.ProcessState.Success() {
+	if p.jq.ProcessState.Success() || err == io.EOF {
 		return nil, io.EOF
 	}
 

jqpipe_test.go

@@ -2,6 +2,7 @@ package jq
 
 import (
 	"encoding/json"
+	"sync"
 	"testing"
 )
 
@@ -60,3 +61,22 @@ func failEval(t *testing.T, inp, expr string, results []json.RawMessage, layout
 	t.Errorf(layout, info...)
 	return false
 }
+
+func TestJQEvalRaceCondition(t *testing.T) {
+	t.Parallel()
+
+	var wg sync.WaitGroup
+	for i := 0; i < 100; i++ {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+
+			_, err := Eval(`{ "foo": { "bar": { "baz": 123 } } }`, ".")
+			if err != nil {
+				t.Errorf("err should be nil: %s", err)
+			}
+		}()
+	}
+
+	wg.Wait()
+}