kubectl: avoid panic with nil gvk

The decoder will return a nil gvk in case it errors out and getting the version out of that gvk naturally will panic. Bail out as soon as we can check that the error is non-nil. kubectl edit was the primary victim.

kubectl: avoid panic with nil gvk
29ff69fd · Michail Kargakis · d0b887e4 · 29ff69fd
Commit 29ff69fd authored Apr 28, 2016 by Michail Kargakis
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

mapper.go pkg/kubectl/resource/mapper.go +3 -0

No files found.
--- a/pkg/kubectl/resource/mapper.go
+++ b/pkg/kubectl/resource/mapper.go
@@ -52,6 +52,9 @@ type Mapper struct {
 func (m *Mapper) InfoForData(data []byte, source string) (*Info, error) {
 	versions := &runtime.VersionedObjects{}
 	_, gvk, err := m.Decode(data, nil, versions)
+	if err != nil {
+		return nil, fmt.Errorf("unable to decode %q: %v", source, err)
+	}
 	var obj runtime.Object
 	var versioned runtime.Object
 	if registered.IsThirdPartyAPIGroupVersion(gvk.GroupVersion()) {