github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check for walkErr before fileInfo deref

Browse Source
This commit is contained in:
Seth Jennings
2017-05-08 13:39:01 -05:00
parent 843c40e32e
commit 77ac3290d6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/plugins/loader.go
View File

@@ -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
}