diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-09 17:47:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 17:47:47 +0200 |
| commit | fbe09d78e91c9ac5cadc8b00a67c7d7f89d64868 (patch) | |
| tree | e241ba0e0521f9def4bb3124bac1e624383448b2 /vendor/github.com/json-iterator/go/config.go | |
| parent | 607cfa3ffb6ae54dc196827b4705601bf4c386e2 (diff) | |
| parent | 2df9edbd4fafa12387c71ebd048dbb9e1814c3fc (diff) | |
| download | podman-fbe09d78e91c9ac5cadc8b00a67c7d7f89d64868.tar.gz podman-fbe09d78e91c9ac5cadc8b00a67c7d7f89d64868.tar.bz2 podman-fbe09d78e91c9ac5cadc8b00a67c7d7f89d64868.zip | |
Merge pull request #6533 from containers/dependabot/go_modules/github.com/json-iterator/go-1.1.10
Bump github.com/json-iterator/go from 1.1.9 to 1.1.10
Diffstat (limited to 'vendor/github.com/json-iterator/go/config.go')
| -rw-r--r-- | vendor/github.com/json-iterator/go/config.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/github.com/json-iterator/go/config.go b/vendor/github.com/json-iterator/go/config.go index 8c58fcba5..2adcdc3b7 100644 --- a/vendor/github.com/json-iterator/go/config.go +++ b/vendor/github.com/json-iterator/go/config.go @@ -183,11 +183,11 @@ func (cfg *frozenConfig) validateJsonRawMessage(extension EncoderExtension) { encoder := &funcEncoder{func(ptr unsafe.Pointer, stream *Stream) { rawMessage := *(*json.RawMessage)(ptr) iter := cfg.BorrowIterator([]byte(rawMessage)) + defer cfg.ReturnIterator(iter) iter.Read() - if iter.Error != nil { + if iter.Error != nil && iter.Error != io.EOF { stream.WriteRaw("null") } else { - cfg.ReturnIterator(iter) stream.WriteRaw(string(rawMessage)) } }, func(ptr unsafe.Pointer) bool { |