Fix NPE in streamutil.Errors

blendle · May 22, 2018 · 391997a · 391997a
1 parent 79ecd70
commit 391997a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/streamutil/error.go b/streamutil/error.go
@@ -15,6 +15,10 @@ func Errors(errs ...stream.ErrorCloser) <-chan error {
 	errChan := make(chan error)
 
 	for _, e := range errs {
+		if e == nil {
+			continue
+		}
+
 		go func(c <-chan error) {
 			for {
 				errChan <- (<-c)

diff --git a/streamutil/error_test.go b/streamutil/error_test.go
@@ -7,6 +7,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/blendle/go-streamprocessor/stream"
 	"github.com/blendle/go-streamprocessor/streamutil"
 	"github.com/blendle/go-streamprocessor/streamutil/testutil"
 	"github.com/stretchr/testify/assert"
@@ -123,8 +124,9 @@ func TestErrors(t *testing.T) {
 
 	ec1 := &errorCloserStub{errors: make(chan error)}
 	ec2 := &errorCloserStub{errors: make(chan error)}
+	var ec3 stream.ErrorCloser
 
-	ch := streamutil.Errors(ec1, ec2)
+	ch := streamutil.Errors(ec1, ec2, ec3)
 
 	go func() { ec1.errors <- errors.New("error 1") }()