mirror of
https://github.com/kubernetes/sample-controller.git
synced 2025-02-01 01:12:52 +08:00
c0feae0701
Automatic merge from submit-queue (batch tested with PRs 59965, 59115, 63076, 63059). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Upgrade dep json-iterator/go to fix base64 decode bug **What this PR does / why we need it**: upgrade dep `json-iterator/go` to fix base64 decode bug #62742 **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #62742 **Special notes for your reviewer**: Just upgrade `json-iterator/go` to latest which includes base64 decode fix https://github.com/json-iterator/go/pull/266 No other code changes **Release note**: ```release-note None ``` Kubernetes-commit: 3dbcd1ddcee786f443f89a82514bbd9c6ad06c99
59 lines
1.2 KiB
Go
59 lines
1.2 KiB
Go
package jsoniter
|
|
|
|
// ReadArray read array element, tells if the array has more element to read.
|
|
func (iter *Iterator) ReadArray() (ret bool) {
|
|
c := iter.nextToken()
|
|
switch c {
|
|
case 'n':
|
|
iter.skipThreeBytes('u', 'l', 'l')
|
|
return false // null
|
|
case '[':
|
|
c = iter.nextToken()
|
|
if c != ']' {
|
|
iter.unreadByte()
|
|
return true
|
|
}
|
|
return false
|
|
case ']':
|
|
return false
|
|
case ',':
|
|
return true
|
|
default:
|
|
iter.ReportError("ReadArray", "expect [ or , or ] or n, but found "+string([]byte{c}))
|
|
return
|
|
}
|
|
}
|
|
|
|
// ReadArrayCB read array with callback
|
|
func (iter *Iterator) ReadArrayCB(callback func(*Iterator) bool) (ret bool) {
|
|
c := iter.nextToken()
|
|
if c == '[' {
|
|
c = iter.nextToken()
|
|
if c != ']' {
|
|
iter.unreadByte()
|
|
if !callback(iter) {
|
|
return false
|
|
}
|
|
c = iter.nextToken()
|
|
for c == ',' {
|
|
if !callback(iter) {
|
|
return false
|
|
}
|
|
c = iter.nextToken()
|
|
}
|
|
if c != ']' {
|
|
iter.ReportError("ReadArrayCB", "expect ] in the end, but found "+string([]byte{c}))
|
|
return false
|
|
}
|
|
return true
|
|
}
|
|
return true
|
|
}
|
|
if c == 'n' {
|
|
iter.skipThreeBytes('u', 'l', 'l')
|
|
return true // null
|
|
}
|
|
iter.ReportError("ReadArrayCB", "expect [ or n, but found "+string([]byte{c}))
|
|
return false
|
|
}
|