Skip to content

libopenbsd/pwd.c, ls/ls.c: fix segfault #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ryanwoodsmall wants to merge 1 commit into
base: master
Choose a base branch
from
Open

libopenbsd/pwd.c, ls/ls.c: fix segfault #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions libopenbsd/pwd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ gid_from_group(const char *name, gid_t *gid)
const char *
group_from_gid(gid_t gid, int nogroup)
{

return (getgrgid(gid)->gr_name);
if (getgrgid(gid) != NULL)
return (getgrgid(gid)->gr_name);
return (getgrgid(nogroup)->gr_name);
}

int
Expand All @@ -43,6 +44,7 @@ uid_from_user(const char *name, uid_t *uid)
const char *
user_from_uid(uid_t uid, int nouser)
{

return (getpwuid(uid)->pw_name);
if (getpwuid(uid) != NULL)
return (getpwuid(uid)->pw_name);
return (getpwuid(nouser)->pw_name);
}
4 changes: 2 additions & 2 deletions ls/ls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,8 +498,8 @@ display(FTSENT *p, FTSENT *list)
user = nuser;
group = ngroup;
} else {
user = getpwuid(sp->st_uid)->pw_name;
group = getgrgid(sp->st_gid)->gr_name;
user = user_from_uid(sp->st_uid, 0);
group = group_from_gid(sp->st_gid, 0);
}
if ((ulen = strlen(user)) > maxuser)
maxuser = ulen;
Expand Down