kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4081 from justinsb/files_npe 

Automatic merge from submit-queue.

files task: fix potential nil pointer error
This commit is contained in:
Kubernetes Submit Queue 2017-12-15 03:47:04 -08:00 committed by GitHub
parent f0303c80dc 060d94e9e8
commit 56da7ed34e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
upup/pkg/fi/files_owner.go
View File

@ -37,11 +37,17 @@ func EnsureFileOwner(destPath string, owner string, groupName string) (bool, err
if err != nil { if err != nil {
return changed, fmt.Errorf("error looking up user %q: %v", owner, err) return changed, fmt.Errorf("error looking up user %q: %v", owner, err)
} }
if user == nil {
return changed, fmt.Errorf("user %q not found", owner)
}
group, err := LookupGroup(groupName) group, err := LookupGroup(groupName)
if err != nil { if err != nil {
return changed, fmt.Errorf("error looking up group %q: %v", groupName, err) return changed, fmt.Errorf("error looking up group %q: %v", groupName, err)
} }
if group == nil {
return changed, fmt.Errorf("group %q not found", owner)
}
if int(stat.Sys().(*syscall.Stat_t).Uid) == user.Uid && int(stat.Sys().(*syscall.Stat_t).Gid) == group.Gid { if int(stat.Sys().(*syscall.Stat_t).Uid) == user.Uid && int(stat.Sys().(*syscall.Stat_t).Gid) == group.Gid {
return changed, nil return changed, nil