Merge pull request #28441 from smarterclayton/reflect_check

Automatic merge from submit-queue ObjectReflectDiff has an incorrect array index comparison Is comparing the wrong field for bounds. @deads2k

Merge pull request #28441 from smarterclayton/reflect_check
61a92ef7 · k8s-merge-robot · GitHub · a75cb46e · ee561236 · 61a92ef7
Commit 61a92ef7 authored Jul 05, 2016 by k8s-merge-robot Committed by GitHub Jul 05, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

diff.go pkg/util/diff/diff.go +2 -2

No files found.
--- a/pkg/util/diff/diff.go
+++ b/pkg/util/diff/diff.go
@@ -177,10 +177,10 @@ func objectReflectDiff(path *field.Path, a, b reflect.Value) []diff {
 			}
 		}
 		var diffs []diff
-		for i := l; l < lA; i++ {
+		for i := l; i < lA; i++ {
 			diffs = append(diffs, diff{path: path.Index(i), a: a.Index(i), b: nil})
 		}
-		for i := l; l < lB; i++ {
+		for i := l; i < lB; i++ {
 			diffs = append(diffs, diff{path: path.Index(i), a: nil, b: b.Index(i)})
 		}
 		return diffs