Merge pull request #42253 from liggitt/nil-invalid-field-error

Automatic merge from submit-queue (batch tested with PRs 42128, 42064, 42253, 42309, 42322) Fix panic on nil invalid field error bug fix for validation panic if a field.Invalid is constructed with a nil badvalue, the Error() method panics, since reflect.TypeOf() returns nil

Merge pull request #42253 from liggitt/nil-invalid-field-error
3d868401 · Kubernetes Submit Queue · GitHub · 98ff34cc · 0cf9b0df · 3d868401
Commit 3d868401 authored Mar 02, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 1 deletion

errors.go ...c/k8s.io/apimachinery/pkg/util/validation/field/errors.go +4 -1

errors_test.go ....io/apimachinery/pkg/util/validation/field/errors_test.go +8 -0

No files found.
--- a/staging/src/k8s.io/apimachinery/pkg/util/validation/field/errors.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/validation/field/errors.go
@@ -50,7 +50,10 @@ func (v *Error) ErrorBody() string {
 		s = fmt.Sprintf("%s", v.Type)
 	default:
 		value := v.BadValue
-		if reflect.TypeOf(value).Kind() == reflect.Ptr {
+		valueType := reflect.TypeOf(value)
+		if value == nil || valueType == nil {
+			value = "null"
+		} else if valueType.Kind() == reflect.Ptr {
 			if reflectValue := reflect.ValueOf(value); reflectValue.IsNil() {
 				value = "null"
 			} else {

--- a/staging/src/k8s.io/apimachinery/pkg/util/validation/field/errors_test.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/validation/field/errors_test.go
@@ -62,6 +62,14 @@ func TestMakeFuncs(t *testing.T) {
 }

 func TestErrorUsefulMessage(t *testing.T) {
+	{
+		s := Invalid(nil, nil, "").Error()
+		t.Logf("message: %v", s)
+		if !strings.Contains(s, "null") {
+			t.Errorf("error message did not contain 'null': %s", s)
+		}
+	}
+
 	s := Invalid(NewPath("foo"), "bar", "deet").Error()
 	t.Logf("message: %v", s)
 	for _, part := range []string{"foo", "bar", "deet", ErrorTypeInvalid.String()} {