From 060d94e9e89781b494603d4b8d217feda9dd05a6 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Fri, 15 Dec 2017 01:06:00 -0500 Subject: [PATCH] files task: fix potential nil pointer error If the user didn't exist, we would panic with a nil pointer error --- upup/pkg/fi/files_owner.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/upup/pkg/fi/files_owner.go b/upup/pkg/fi/files_owner.go index 7a0a579aee..677b190779 100644 --- a/upup/pkg/fi/files_owner.go +++ b/upup/pkg/fi/files_owner.go @@ -37,11 +37,17 @@ func EnsureFileOwner(destPath string, owner string, groupName string) (bool, err if err != nil { 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) if err != nil { 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 { return changed, nil