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

Merge pull request #93960 from habibrosyad/patch-92402-5

Browse Source 
fix vendor/k8s.io/apimachinery/pkg/util/framer staticcheck
This commit is contained in:
Kubernetes Prow Robot 2020-08-27 04:48:48 -07:00 committed by GitHub
commit 9f14b1c89c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.staticcheck_failures
View File

@ -21,7 +21,6 @@ vendor/k8s.io/apimachinery/pkg/conversion
vendor/k8s.io/apimachinery/pkg/runtime vendor/k8s.io/apimachinery/pkg/runtime
vendor/k8s.io/apimachinery/pkg/runtime/serializer/json vendor/k8s.io/apimachinery/pkg/runtime/serializer/json
vendor/k8s.io/apimachinery/pkg/runtime/serializer/versioning vendor/k8s.io/apimachinery/pkg/runtime/serializer/versioning
vendor/k8s.io/apimachinery/pkg/util/framer
vendor/k8s.io/apimachinery/pkg/util/httpstream/spdy vendor/k8s.io/apimachinery/pkg/util/httpstream/spdy
vendor/k8s.io/apimachinery/pkg/util/net vendor/k8s.io/apimachinery/pkg/util/net
vendor/k8s.io/apimachinery/pkg/util/sets/types vendor/k8s.io/apimachinery/pkg/util/sets/types

3
staging/src/k8s.io/apimachinery/pkg/util/framer/framer.go
View File

@ -132,12 +132,14 @@ func (r *jsonFrameReader) Read(data []byte) (int, error) {
// Return whatever remaining data exists from an in progress frame // Return whatever remaining data exists from an in progress frame
if n := len(r.remaining); n > 0 { if n := len(r.remaining); n > 0 {
if n <= len(data) { if n <= len(data) {
//lint:ignore SA4006,SA4010 underlying array of data is modified here.
data = append(data[0:0], r.remaining...) data = append(data[0:0], r.remaining...)
r.remaining = nil r.remaining = nil
return n, nil return n, nil
} }
n = len(data) n = len(data)
//lint:ignore SA4006,SA4010 underlying array of data is modified here.
data = append(data[0:0], r.remaining[:n]...) data = append(data[0:0], r.remaining[:n]...)
r.remaining = r.remaining[n:] r.remaining = r.remaining[n:]
return n, io.ErrShortBuffer return n, io.ErrShortBuffer
@ -155,6 +157,7 @@ func (r *jsonFrameReader) Read(data []byte) (int, error) {
// and set m to it, which means we need to copy the partial result back into data and preserve // and set m to it, which means we need to copy the partial result back into data and preserve
// the remaining result for subsequent reads. // the remaining result for subsequent reads.
if len(m) > n { if len(m) > n {
//lint:ignore SA4006,SA4010 underlying array of data is modified here.
data = append(data[0:0], m[:n]...) data = append(data[0:0], m[:n]...)
r.remaining = m[n:] r.remaining = m[n:]
return n, io.ErrShortBuffer return n, io.ErrShortBuffer