github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 23:37:01 +00:00
Code Issues Projects Releases Wiki Activity

Handle nil values in conversion.EnforcePtr()

Browse Source 
Signed-off-by: Vojtech Vitek (V-Teq) <vvitek@redhat.com>
This commit is contained in:
Vojtech Vitek (V-Teq) 2014-10-27 15:01:24 +01:00
parent 6a6f24b126
commit 8969f0df7e
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/conversion/meta.go
View File

@ -118,5 +118,8 @@ func EnforcePtr(obj interface{}) (reflect.Value, error) {
} }
return reflect.Value{}, fmt.Errorf("expected pointer, but got %v type", v.Type().Name()) return reflect.Value{}, fmt.Errorf("expected pointer, but got %v type", v.Type().Name())
} }
if v.IsNil() {
return reflect.Value{}, fmt.Errorf("expected pointer, but got nil")
}
return v.Elem(), nil return v.Elem(), nil
} }

8
pkg/conversion/meta_test.go
View File

@ -253,3 +253,11 @@ func TestInvalidPtrValueKind(t *testing.T) {
} }
} }
} }
func TestEnforceNilPtr(t *testing.T) {
var nilPtr *struct{}
_, err := EnforcePtr(nilPtr)
if err == nil {
t.Errorf("Expected error on nil pointer")
}
}