github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

json unmarshal coded error at function applyJSPatch()

Browse Source
This commit is contained in:
attlee-wang
2019-11-07 20:40:28 +08:00
parent 73b2c82b28
commit 1da2d00935
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go
View File

@@ -341,7 +341,7 @@ func (p *jsonPatcher) applyJSPatch(versionedJS []byte) (patchedJS []byte, retErr
// TODO(liggitt): drop this once golang json parser limits stack depth (https://github.com/golang/go/issues/31789) // TODO(liggitt): drop this once golang json parser limits stack depth (https://github.com/golang/go/issues/31789)
if len(p.patchBytes) > 1024*1024 { if len(p.patchBytes) > 1024*1024 {
v := []interface{}{} v := []interface{}{}
if err := json.Unmarshal(p.patchBytes, v); err != nil { if err := json.Unmarshal(p.patchBytes, &v); err != nil {
return nil, errors.NewBadRequest(fmt.Sprintf("error decoding patch: %v", err)) return nil, errors.NewBadRequest(fmt.Sprintf("error decoding patch: %v", err))
} }
} }
@@ -365,7 +365,7 @@ func (p *jsonPatcher) applyJSPatch(versionedJS []byte) (patchedJS []byte, retErr
// TODO(liggitt): drop this once golang json parser limits stack depth (https://github.com/golang/go/issues/31789) // TODO(liggitt): drop this once golang json parser limits stack depth (https://github.com/golang/go/issues/31789)
if len(p.patchBytes) > 1024*1024 { if len(p.patchBytes) > 1024*1024 {
v := map[string]interface{}{} v := map[string]interface{}{}
if err := json.Unmarshal(p.patchBytes, v); err != nil { if err := json.Unmarshal(p.patchBytes, &v); err != nil {
return nil, errors.NewBadRequest(fmt.Sprintf("error decoding patch: %v", err)) return nil, errors.NewBadRequest(fmt.Sprintf("error decoding patch: %v", err))
} }
} }