github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Remove json-iterator depth patch

Browse Source
This commit is contained in:
Jordan Liggitt 2019-10-12 10:10:16 -04:00
parent e323279ab9
commit 470dfbfc48
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json/json.go
View File

@ -140,27 +140,7 @@ func (customNumberDecoder) Decode(ptr unsafe.Pointer, iter *jsoniter.Iterator) {
} }
iter.ReportError("DecodeNumber", err.Error()) iter.ReportError("DecodeNumber", err.Error())
default: default:
// init depth, if needed
if iter.Attachment == nil {
iter.Attachment = int(1)
}
// remember current depth
originalAttachment := iter.Attachment
// increment depth before descending
if i, ok := iter.Attachment.(int); ok {
iter.Attachment = i + 1
if i > 10000 {
iter.ReportError("parse", "exceeded max depth")
return
}
}
*(*interface{})(ptr) = iter.Read() *(*interface{})(ptr) = iter.Read()
// restore current depth
iter.Attachment = originalAttachment
} }
} }