Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion json/json.go
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ func (enc *Encoder) Encode(v any) error {
}

encoderBufferPool.Put(buf)
return err
return enc.err
}

// SetEscapeHTML is documented at https://golang.org/pkg/encoding/json/#Encoder.SetEscapeHTML
Expand Down
16 changes: 16 additions & 0 deletions json/json_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1993,3 +1993,19 @@ func TestKind(t *testing.T) {
}
}
}

type errWriter struct{}

func (ew *errWriter) Write([]byte) (n int, err error) {
return 0, errors.New("test-error")
}

func TestWriterErr(t *testing.T) {
enc := NewEncoder(&errWriter{})
err := enc.Encode("")
if err == nil {
t.Error("expected error not returned")
} else if err.Error() != "test-error" {
t.Errorf("unexpected error returned: want=test-error got=%s", err.Error())
}
}