Merge pull request #45508 from sjenning/fix-plugin-loader

Automatic merge from submit-queue (batch tested with PRs 45508, 44258, 44126, 45441, 45320) check for walkErr before fileInfo deref Fixes #45507 @derekwaynecarr @fabianofranz

Merge pull request #45508 from sjenning/fix-plugin-loader
cfe6769f · Kubernetes Submit Queue · GitHub · 6316ecef · 77ac3290 · cfe6769f
Commit cfe6769f authored May 08, 2017 by Kubernetes Submit Queue Committed by GitHub May 08, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

loader.go pkg/kubectl/plugins/loader.go +1 -1

No files found.
--- a/pkg/kubectl/plugins/loader.go
+++ b/pkg/kubectl/plugins/loader.go
@@ -67,7 +67,7 @@ func (l *DirectoryPluginLoader) Load() (Plugins, error) {
 	// read the base directory tree searching for plugin descriptors
 	// fails silently (descriptors unable to be read or unmarshalled are logged but skipped)
 	err = filepath.Walk(base, func(path string, fileInfo os.FileInfo, walkErr error) error {
-		if fileInfo.IsDir() || fileInfo.Name() != PluginDescriptorFilename || walkErr != nil {
+		if walkErr != nil || fileInfo.IsDir() || fileInfo.Name() != PluginDescriptorFilename {
 			return nil
 		}