d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Repair a bug in which a faulty group entry (one with only 2 colons)

Browse Source 
would result in an incorrectly terminated grouplist.

login(1) crashes
Reported by:	Morten Rodal <morten@rodal.no>,
		Matthias Schuendehuette <msch@snafu.de>
This commit is contained in:
Jacques Vidrine 2003-04-20 01:12:00 +00:00
parent 2ccf1ce757
commit 43652a6ba6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=113727
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/libc/gen/getgrent.c
View File

@ -500,7 +500,6 @@ files_group(void *retval, void *mdata, va_list ap)
if (rv & NS_TERMINATE)
break;
}
fin:
if (!stayopen && st->fp != NULL) {
fclose(st->fp);
st->fp = NULL;
@ -1083,7 +1082,7 @@ int
__gr_parse_entry(char *line, size_t linesize, struct group *grp, char *membuf,
size_t membufsize, int *errnop)
{
char *s_gid, *s_mem, **members;
char *s_gid, *s_mem, *p, **members;
unsigned long n;
int maxmembers;
@ -1104,13 +1103,12 @@ __gr_parse_entry(char *line, size_t linesize, struct group *grp, char *membuf,
return (NS_NOTFOUND);
grp->gr_gid = (gid_t)n;
grp->gr_mem = members;
if (s_mem[0] == '\0') {
*members = NULL;
return (NS_SUCCESS);
}
while (maxmembers > 1 && s_mem != NULL) {
*members++ = strsep(&s_mem, ",");
maxmembers--;
p = strsep(&s_mem, ",");
if (p != NULL && *p != '\0') {
*members++ = p;
maxmembers--;
}
}
*members = NULL;
if (s_mem == NULL)