Merge pull request #29672 from lixiaobing10051267/masterLen

Automatic merge from submit-queue Add handling empty index key that may cause panic issue if len(indexKeys) == 0, "return indexKeys[0]" will cause unexpected result.  --- This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/29672)

Merge pull request #29672 from lixiaobing10051267/masterLen
48b7aca2 · Kubernetes Submit Queue · GitHub · eef8bfec · a9d63166 · 48b7aca2
Commit 48b7aca2 authored Aug 10, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 10, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

index.go pkg/client/cache/index.go +3 -0

No files found.
--- a/pkg/client/cache/index.go
+++ b/pkg/client/cache/index.go
@@ -55,6 +55,9 @@ func IndexFuncToKeyFuncAdapter(indexFunc IndexFunc) KeyFunc {
 		if len(indexKeys) > 1 {
 			return "", fmt.Errorf("too many keys: %v", indexKeys)
 		}
+		if len(indexKeys) == 0 {
+			return "", fmt.Errorf("unexpected empty indexKeys")
+		}
 		return indexKeys[0], nil
 	}
 }