diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-11-07 18:49:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-07 18:49:19 +0100 |
| commit | 347499778cb1a7045dc831f99b9539bc20fe008d (patch) | |
| tree | c31cde0f384a912fa950136ddb0797c631c81e90 /vendor/github.com/json-iterator/go/reflect.go | |
| parent | 20c8a01af192db69264aa44f46193552206fa427 (diff) | |
| parent | d55734e69bcb645802b33ef703d336b89bbeefe1 (diff) | |
| download | podman-347499778cb1a7045dc831f99b9539bc20fe008d.tar.gz podman-347499778cb1a7045dc831f99b9539bc20fe008d.tar.bz2 podman-347499778cb1a7045dc831f99b9539bc20fe008d.zip | |
Merge pull request #4378 from containers/dependabot/go_modules/github.com/json-iterator/go-1.1.8
Bump github.com/json-iterator/go from 1.1.7 to 1.1.8
Diffstat (limited to 'vendor/github.com/json-iterator/go/reflect.go')
| -rw-r--r-- | vendor/github.com/json-iterator/go/reflect.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vendor/github.com/json-iterator/go/reflect.go b/vendor/github.com/json-iterator/go/reflect.go index 4459e203f..74974ba74 100644 --- a/vendor/github.com/json-iterator/go/reflect.go +++ b/vendor/github.com/json-iterator/go/reflect.go @@ -60,6 +60,7 @@ func (b *ctx) append(prefix string) *ctx { // ReadVal copy the underlying JSON into go interface, same as json.Unmarshal func (iter *Iterator) ReadVal(obj interface{}) { + depth := iter.depth cacheKey := reflect2.RTypeOf(obj) decoder := iter.cfg.getDecoderFromCache(cacheKey) if decoder == nil { @@ -76,6 +77,10 @@ func (iter *Iterator) ReadVal(obj interface{}) { return } decoder.Decode(ptr, iter) + if iter.depth != depth { + iter.ReportError("ReadVal", "unexpected mismatched nesting") + return + } } // WriteVal copy the go interface into underlying JSON, same as json.Marshal |