mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 12:43:23 +00:00
Merge pull request #93960 from habibrosyad/patch-92402-5
fix vendor/k8s.io/apimachinery/pkg/util/framer staticcheck
This commit is contained in:
commit
9f14b1c89c
@ -21,7 +21,6 @@ vendor/k8s.io/apimachinery/pkg/conversion
|
||||
vendor/k8s.io/apimachinery/pkg/runtime
|
||||
vendor/k8s.io/apimachinery/pkg/runtime/serializer/json
|
||||
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/net
|
||||
vendor/k8s.io/apimachinery/pkg/util/sets/types
|
||||
|
@ -132,12 +132,14 @@ func (r *jsonFrameReader) Read(data []byte) (int, error) {
|
||||
// Return whatever remaining data exists from an in progress frame
|
||||
if n := len(r.remaining); n > 0 {
|
||||
if n <= len(data) {
|
||||
//lint:ignore SA4006,SA4010 underlying array of data is modified here.
|
||||
data = append(data[0:0], r.remaining...)
|
||||
r.remaining = nil
|
||||
return n, nil
|
||||
}
|
||||
|
||||
n = len(data)
|
||||
//lint:ignore SA4006,SA4010 underlying array of data is modified here.
|
||||
data = append(data[0:0], r.remaining[:n]...)
|
||||
r.remaining = r.remaining[n:]
|
||||
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
|
||||
// the remaining result for subsequent reads.
|
||||
if len(m) > n {
|
||||
//lint:ignore SA4006,SA4010 underlying array of data is modified here.
|
||||
data = append(data[0:0], m[:n]...)
|
||||
r.remaining = m[n:]
|
||||
return n, io.ErrShortBuffer
|
||||
|
Loading…
Reference in New Issue
Block a user