Skip to content

K
k3s
Commit dbcc199d authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #48778 from juanvallejo/jvallejo/fix-jsonpath-negative-index-panic

Automatic merge from submit-queue stop jsonpath panicing on negative array length Related downstream issue: https://github.com/openshift/origin/issues/15075 Returns error if provided jsonpath value results in a negative slice index after adding the length of the slice: ```go a := [0, 1, 2, 3] b := a[-1:] // 3 c := a[-4:] // 0 d := a[-5:] // out of range error e := a[4:] // out of range error ``` **Release note**: ```release-note NONE ``` cc @fabianofranz
parents d368afd8 113ff3bb
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
staging/src/k8s.io/client-go/util/jsonpath/jsonpath.go
View file @ dbcc199d
...@@ -259,10 +259,10 @@ func (j *JSONPath) evalArray(input []reflect.Value, node *ArrayNode) ([]reflect. ...@@ -259,10 +259,10 @@ func (j *JSONPath) evalArray(input []reflect.Value, node *ArrayNode) ([]reflect.
sliceLength := value.Len() sliceLength := value.Len()
if params[1].Value != params[0].Value { // if you're requesting zero elements, allow it through. if params[1].Value != params[0].Value { // if you're requesting zero elements, allow it through.
if params[0].Value >= sliceLength { if params[0].Value >= sliceLength || params[0].Value < 0 {
return input, fmt.Errorf("array index out of bounds: index %d, length %d", params[0].Value, sliceLength) return input, fmt.Errorf("array index out of bounds: index %d, length %d", params[0].Value, sliceLength)
} }
if params[1].Value > sliceLength { if params[1].Value > sliceLength || params[1].Value < 0 {
return input, fmt.Errorf("array index out of bounds: index %d, length %d", params[1].Value-1, sliceLength) return input, fmt.Errorf("array index out of bounds: index %d, length %d", params[1].Value-1, sliceLength)
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment