Merge pull request #11254 from m-messiah/fix-has-same-state-nil

🐛Fix conditions hasSameState nil pointer dereference

Author: k8s-ci-robot

util/conditions/setter.go

@@ -203,6 +203,9 @@ func lexicographicLess(i, j *clusterv1.Condition) bool {
 // HasSameState returns true if a condition has the same state of another; state is defined
 // by the union of following fields: Type, Status, Reason, Severity and Message (it excludes LastTransitionTime).
 func HasSameState(i, j *clusterv1.Condition) bool {
+	if i == nil || j == nil {
+		return i == j
+	}
 	return i.Type == j.Type &&
 		i.Status == j.Status &&
 		i.Reason == j.Reason &&

util/conditions/setter_test.go

@@ -33,6 +33,16 @@ import (
 func TestHasSameState(t *testing.T) {
 	g := NewWithT(t)
 
+	// two nils
+	var nil2 *clusterv1.Condition
+	g.Expect(HasSameState(nil1, nil2)).To(BeTrue())
+
+	// nil condition 1
+	g.Expect(HasSameState(nil1, true1)).To(BeFalse())
+
+	// nil condition 2
+	g.Expect(HasSameState(true1, nil2)).To(BeFalse())
+
 	// same condition
 	falseInfo2 := falseInfo1.DeepCopy()
 	g.Expect(HasSameState(falseInfo1, falseInfo2)).To(BeTrue())