Author: julian
Date: Thu Mar 6 19:58:03 2014
New Revision: 262865
URL: http://svnweb.freebsd.org/changeset/base/262865
Log:
Part 2 of bug 187310.. had to commit separately due to local confusion.
Don't let pw crash when give certain input.
PR: 187310
Submitted by: Kim Shrier
MFC after: 1 week
Modified:
head/usr.sbin/pw/pw_user.c
Modified: head/usr.sbin/pw/pw_user.c
==============================================================================
--- head/usr.sbin/pw/pw_user.c Thu Mar 6 19:26:08 2014 (r262864)
+++ head/usr.sbin/pw/pw_user.c Thu Mar 6 19:58:03 2014 (r262865)
@@ -425,19 +425,22 @@ pw_user(struct userconf * cnf, int mode,
}
grp = GETGRNAM(a_name->val);
- if (grp != NULL && *grp->gr_mem == NULL)
+ if (grp != NULL &&
+ (grp->gr_mem == NULL || *grp->gr_mem == NULL))
delgrent(GETGRNAM(a_name->val));
SETGRENT();
while ((grp = GETGRENT()) != NULL) {
int i;
char group[MAXLOGNAME];
- for (i = 0; grp->gr_mem[i] != NULL; i++) {
- if (!strcmp(grp->gr_mem[i],
a_name->val)) {
- while (grp->gr_mem[i] != NULL) {
- grp->gr_mem[i] =
grp->gr_mem[i+1];
- }
- strlcpy(group, grp->gr_name,
MAXLOGNAME);
- chggrent(group, grp);
+ if (grp->gr_mem != NULL) {
+ for (i = 0; grp->gr_mem[i] != NULL;
i++) {
+ if (!strcmp(grp->gr_mem[i],
a_name->val)) {
+ while (grp->gr_mem[i]
!= NULL) {
+ grp->gr_mem[i]
= grp->gr_mem[i+1];
+ }
+ strlcpy(group,
grp->gr_name, MAXLOGNAME);
+ chggrent(group, grp);
+ }
}
}
}
@@ -908,7 +911,8 @@ pw_gidpolicy(struct userconf * cnf, stru
errx(EX_NOUSER, "group `%s' is not defined",
a_gid->val);
}
gid = grp->gr_gid;
- } else if ((grp = GETGRNAM(nam)) != NULL && grp->gr_mem[0] == NULL) {
+ } else if ((grp = GETGRNAM(nam)) != NULL &&
+ (grp->gr_mem == NULL || grp->gr_mem[0] == NULL)) {
gid = grp->gr_gid; /* Already created? Use it anyway... */
} else {
struct cargs grpargs;
@@ -1182,14 +1186,16 @@ print_user(struct passwd * pwd, int pret
while ((grp=GETGRENT()) != NULL)
{
int i = 0;
- while (grp->gr_mem[i] != NULL)
- {
- if (strcmp(grp->gr_mem[i], pwd->pw_name)==0)
+ if (grp->gr_mem != NULL) {
+ while (grp->gr_mem[i] != NULL)
{
- printf(j++ == 0 ? " Groups: %s" :
",%s", grp->gr_name);
- break;
+ if (strcmp(grp->gr_mem[i],
pwd->pw_name)==0)
+ {
+ printf(j++ == 0 ? " Groups:
%s" : ",%s", grp->gr_name);
+ break;
+ }
+ ++i;
}
- ++i;
}
}
ENDGRENT();
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
