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

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

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 45508, 44258, 44126, 45441, 45320)

check for walkErr before fileInfo deref

Fixes #45507

@derekwaynecarr @fabianofranz
This commit is contained in:
Kubernetes Submit Queue
2017-05-08 16:34:41 -07:00
committed by GitHub
parent 6316ecefaa 77ac3290d6
commit cfe6769f4e
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 // read the base directory tree searching for plugin descriptors
// fails silently (descriptors unable to be read or unmarshalled are logged but skipped) // 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 { 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 return nil
} }