Merge pull request #2 from enisoc/format-string
Don't pass arbitrary strings as Errorf() format strings.
diff --git a/errors.go b/errors.go
index 5417b4b..9dfc271 100644
--- a/errors.go
+++ b/errors.go
@@ -2,6 +2,7 @@
package errors
import (
+ "errors"
"fmt"
"io"
"os"
@@ -33,7 +34,7 @@
error
loc
}{
- fmt.Errorf(text),
+ errors.New(text),
loc(pc),
}
}
diff --git a/errors_test.go b/errors_test.go
index c0cd4ef..889a36f 100644
--- a/errors_test.go
+++ b/errors_test.go
@@ -2,6 +2,7 @@
import (
"bytes"
+ "errors"
"fmt"
"io"
"reflect"
@@ -16,6 +17,7 @@
{"", fmt.Errorf("")},
{"foo", fmt.Errorf("foo")},
{"foo", New("foo")},
+ {"string with format specifiers: %v", errors.New("string with format specifiers: %v")},
}
for _, tt := range tests {
@@ -121,13 +123,13 @@
want: "cause error\nEOF\n",
}, {
err: x, // return from errors.New
- want: "github.com/pkg/errors/errors_test.go:104: error\n",
+ want: "github.com/pkg/errors/errors_test.go:106: error\n",
}, {
err: Wrap(x, "message"),
- want: "github.com/pkg/errors/errors_test.go:126: message\ngithub.com/pkg/errors/errors_test.go:104: error\n",
+ want: "github.com/pkg/errors/errors_test.go:128: message\ngithub.com/pkg/errors/errors_test.go:106: error\n",
}, {
err: Wrap(Wrap(x, "message"), "another message"),
- want: "github.com/pkg/errors/errors_test.go:129: another message\ngithub.com/pkg/errors/errors_test.go:129: message\ngithub.com/pkg/errors/errors_test.go:104: error\n",
+ want: "github.com/pkg/errors/errors_test.go:131: another message\ngithub.com/pkg/errors/errors_test.go:131: message\ngithub.com/pkg/errors/errors_test.go:106: error\n",
}}
for i, tt := range tests {
