aboutsummaryrefslogtreecommitdiffhomepage
path: root/vendor/github.com/tdewolff/parse/json/parse.go
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/tdewolff/parse/json/parse.go')
-rw-r--r--vendor/github.com/tdewolff/parse/json/parse.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/vendor/github.com/tdewolff/parse/json/parse.go b/vendor/github.com/tdewolff/parse/json/parse.go
index ae133f2..5c78af8 100644
--- a/vendor/github.com/tdewolff/parse/json/parse.go
+++ b/vendor/github.com/tdewolff/parse/json/parse.go
@@ -99,10 +99,10 @@ func NewParser(r io.Reader) *Parser {
// Err returns the error encountered during tokenization, this is often io.EOF but also other errors can be returned.
func (p *Parser) Err() error {
- if err := p.r.Err(); err != nil {
- return err
+ if p.err != nil {
+ return p.err
}
- return p.err
+ return p.r.Err()
}
// Restore restores the NULL byte at the end of the buffer.