fix multi.Errors panic on nil append (#53)

This extends the nil check for multi.Errors to the Append function to make sure nil errors do not end up in the slice, causing a panic when the error string is generated. Signed-off-by: Jeremy Asher <[email protected]>
hyperledger · Feb 19, 2020 · ae164c9 · ae164c9
1 parent be7b275
commit ae164c9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/pkg/common/errors/multi/multi.go b/pkg/common/errors/multi/multi.go
@@ -44,6 +44,9 @@ func Append(errs error, err error) error {
 	if !ok {
 		return New(errs, err)
 	}
+	if err == nil {
+		return errs
+	}
 	return append(m, err)
 }
 

diff --git a/pkg/common/errors/multi/multi_test.go b/pkg/common/errors/multi/multi_test.go
@@ -42,6 +42,9 @@ func TestAppend(t *testing.T) {
 	assert.Equal(t, testErr, m1[0])
 	assert.Equal(t, testErr2, m1[1])
 
+	m = Append(Errors{testErr}, nil)
+	assert.Equal(t, Errors{testErr}, m)
+
 	m = Append(Errors{testErr}, testErr2)
 	m1, ok = m.(Errors)
 	assert.True(t, ok)