Index: head/usr.sbin/pw/pw_vpw.c
===================================================================
--- head/usr.sbin/pw/pw_vpw.c	(revision 285255)
+++ head/usr.sbin/pw/pw_vpw.c	(revision 285256)
@@ -1,200 +1,207 @@
 /*-
  * Copyright (C) 1996
  *	David L. Nugent.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY DAVID L. NUGENT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL DAVID L. NUGENT OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  */
 
 #ifndef lint
 static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
 #include <pwd.h>
 #include <grp.h>
 #include <libutil.h>
 #define _WITH_GETLINE
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/param.h>
+#include <err.h>
 
 #include "pwupd.h"
 
 static FILE * pwd_fp = NULL;
 
 void
 vendpwent(void)
 {
 	if (pwd_fp != NULL) {
 		fclose(pwd_fp);
 		pwd_fp = NULL;
 	}
 }
 
 void
 vsetpwent(void)
 {
 	vendpwent();
 }
 
 static struct passwd *
 vnextpwent(char const *nam, uid_t uid, int doclose)
 {
 	struct passwd *pw;
 	char *line;
 	size_t linecap;
 	ssize_t linelen;
 
 	pw = NULL;
 	line = NULL;
 	linecap = 0;
 	linelen = 0;
 
 	if (pwd_fp != NULL || (pwd_fp = fopen(getpwpath(_MASTERPASSWD), "r")) != NULL) {
 		while ((linelen = getline(&line, &linecap, pwd_fp)) > 0) {
 			/* Skip comments and empty lines */
 			if (*line == '\n' || *line == '#')
 				continue;
 			/* trim latest \n */
 			if (line[linelen - 1 ] == '\n')
 				line[linelen - 1] = '\0';
 			pw = pw_scan(line, PWSCAN_MASTER);
+			if (pw == NULL)
+				errx(EXIT_FAILURE, "Invalid user entry in '%s':"
+				    " '%s'", getpwpath(_MASTERPASSWD), line);
 			if (uid != (uid_t)-1) {
 				if (uid == pw->pw_uid)
 					break;
 			} else if (nam != NULL) {
 				if (strcmp(nam, pw->pw_name) == 0)
 					break;
 			} else
 				break;
 			free(pw);
 			pw = NULL;
 		}
 		if (doclose)
 			vendpwent();
 	}
 	free(line);
 
 	return (pw);
 }
 
 struct passwd *
 vgetpwent(void)
 {
   return vnextpwent(NULL, -1, 0);
 }
 
 struct passwd *
 vgetpwuid(uid_t uid)
 {
   return vnextpwent(NULL, uid, 1);
 }
 
 struct passwd *
 vgetpwnam(const char * nam)
 {
   return vnextpwent(nam, -1, 1);
 }
 
 
 static FILE * grp_fp = NULL;
 
 void
 vendgrent(void)
 {
 	if (grp_fp != NULL) {
 		fclose(grp_fp);
 		grp_fp = NULL;
 	}
 }
 
 RET_SETGRENT
 vsetgrent(void)
 {
 	vendgrent();
 #if defined(__FreeBSD__)
 	return 0;
 #endif
 }
 
 static struct group *
 vnextgrent(char const *nam, gid_t gid, int doclose)
 {
 	struct group *gr;
 	char *line;
 	size_t linecap;
 	ssize_t linelen;
 
 	gr = NULL;
 	line = NULL;
 	linecap = 0;
 	linelen = 0;
 
 	if (grp_fp != NULL || (grp_fp = fopen(getgrpath(_GROUP), "r")) != NULL) {
 		while ((linelen = getline(&line, &linecap, grp_fp)) > 0) {
 			/* Skip comments and empty lines */
 			if (*line == '\n' || *line == '#')
 				continue;
 			/* trim latest \n */
 			if (line[linelen - 1 ] == '\n')
 				line[linelen - 1] = '\0';
 			gr = gr_scan(line);
+			if (gr == NULL)
+				errx(EXIT_FAILURE, "Invalid group entry in '%s':"
+				    " '%s'", getgrpath(_GROUP), line);
 			if (gid != (gid_t)-1) {
 				if (gid == gr->gr_gid)
 					break;
 			} else if (nam != NULL) {
 				if (strcmp(nam, gr->gr_name) == 0)
 					break;
 			} else
 				break;
 			free(gr);
 			gr = NULL;
 		}
 		if (doclose)
 			vendgrent();
 	}
 	free(line);
 
 	return (gr);
 }
 
 struct group *
 vgetgrent(void)
 {
   return vnextgrent(NULL, -1, 0);
 }
 
 
 struct group *
 vgetgrgid(gid_t gid)
 {
   return vnextgrent(NULL, gid, 1);
 }
 
 struct group *
 vgetgrnam(const char * nam)
 {
   return vnextgrent(nam, -1, 1);
 }
 
Index: head/usr.sbin/pw/tests/pw_useradd.sh
===================================================================
--- head/usr.sbin/pw/tests/pw_useradd.sh	(revision 285255)
+++ head/usr.sbin/pw/tests/pw_useradd.sh	(revision 285256)
@@ -1,228 +1,254 @@
 # $FreeBSD$
 
 # Import helper functions
 . $(atf_get_srcdir)/helper_functions.shin
 
 # Test add user
 atf_test_case user_add
 user_add_body() {
 	populate_etc_skel
 
 	atf_check -s exit:0 ${PW} useradd test
 	atf_check -s exit:0 -o match:"^test:.*" \
 		grep "^test:.*" $HOME/master.passwd
 }
 
 # Test add user with option -N
 atf_test_case user_add_noupdate
 user_add_noupdate_body() {
 	populate_etc_skel
 
 	atf_check -s exit:0 -o match:"^test:.*" ${PW} useradd test -N
 	atf_check -s exit:1 -o empty grep "^test:.*" $HOME/master.passwd
 }
 
 # Test add user with comments
 atf_test_case user_add_comments
 user_add_comments_body() {
 	populate_etc_skel
 
 	atf_check -s exit:0 ${PW} useradd test -c "Test User,work,123,456"
 	atf_check -s exit:0 -o match:"^test:.*:Test User,work,123,456:" \
 		grep "^test:.*:Test User,work,123,456:" $HOME/master.passwd
 }
 
 # Test add user with comments and option -N
 atf_test_case user_add_comments_noupdate
 user_add_comments_noupdate_body() {
 	populate_etc_skel
 
 	atf_check -s exit:0 -o match:"^test:.*:Test User,work,123,456:" \
 		${PW} useradd test -c "Test User,work,123,456" -N
 	atf_check -s exit:1 -o empty grep "^test:.*" $HOME/master.passwd
 }
 
 # Test add user with invalid comments
 atf_test_case user_add_comments_invalid
 user_add_comments_invalid_body() {
 	populate_etc_skel
 
 	atf_check -s exit:65 -e match:"invalid character" \
 		${PW} useradd test -c "Test User,work,123:456,456"
 	atf_check -s exit:1 -o empty \
 		grep "^test:.*:Test User,work,123:456,456:" $HOME/master.passwd
 }
 
 # Test add user with invalid comments and option -N
 atf_test_case user_add_comments_invalid_noupdate
 user_add_comments_invalid_noupdate_body() {
 	populate_etc_skel
 
 	atf_check -s exit:65 -e match:"invalid character" \
 		${PW} useradd test -c "Test User,work,123:456,456" -N
 	atf_check -s exit:1 -o empty grep "^test:.*" $HOME/master.passwd
 }
 
 # Test add user with alternate homedir
 atf_test_case user_add_homedir
 user_add_homedir_body() {
 	populate_etc_skel
 
 	atf_check -s exit:0 ${PW} useradd test -d /foo/bar
 	atf_check -s exit:0 -o match:"^test:\*:.*::0:0:User &:/foo/bar:.*" \
 		${PW} usershow test
 }
 
 # Test add user with account expiration as an epoch date
 atf_test_case user_add_account_expiration_epoch
 user_add_account_expiration_epoch_body() {
 	populate_etc_skel
 
 	DATE=`date -j -v+1d "+%s"`
 	atf_check -s exit:0 ${PW} useradd test -e ${DATE}
 	atf_check -s exit:0 -o match:"^test:\*:.*::0:${DATE}:.*" \
 		${PW} usershow test
 }
 
 # Test add user with account expiration as a DD-MM-YYYY date
 atf_test_case user_add_account_expiration_date_numeric
 user_add_account_expiration_date_numeric_body() {
 	populate_etc_skel
 
 	DATE=`date -j -v+1d "+%d-%m-%Y"`
 	EPOCH=`date -j -f "%d-%m-%Y %H:%M:%S" "${DATE} 00:00:00" "+%s"`
 	atf_check -s exit:0 ${PW} useradd test -e ${DATE}
 	atf_check -s exit:0 -o match:"^test:\*:.*::0:${EPOCH}:User &:.*" \
 		${PW} usershow test
 }
 
 # Test add user with account expiration as a DD-MM-YYYY date
 atf_test_case user_add_account_expiration_date_month
 user_add_account_expiration_date_month_body() {
 	populate_etc_skel
 
 	DATE=`date -j -v+1d "+%d-%b-%Y"`
 	EPOCH=`date -j -f "%d-%b-%Y %H:%M:%S" "${DATE} 00:00:00" "+%s"`
 	atf_check -s exit:0 ${PW} useradd test -e ${DATE}
 	atf_check -s exit:0 -o match:"^test:\*:.*::0:${EPOCH}:User &:.*" \
 		${PW} usershow test
 }
 
 # Test add user with account expiration as a relative date
 atf_test_case user_add_account_expiration_date_relative
 user_add_account_expiration_date_relative_body() {
 	populate_etc_skel
 
 	EPOCH=`date -j -v+13m "+%s"`
 	BUF=`expr $EPOCH + 5`
 	atf_check -s exit:0 ${PW} useradd test -e +13o
 	TIME=`${PW} usershow test | awk -F ':' '{print $7}'`
 	[ ! -z $TIME -a $TIME -ge $EPOCH -a $TIME -lt $BUF ] || \
 		atf_fail "Expiration time($TIME) was not within $EPOCH - $BUF seconds."
 }
 
 # Test add user with password expiration as an epoch date
 atf_test_case user_add_password_expiration_epoch
 user_add_password_expiration_epoch_body() {
 	populate_etc_skel
 
 	DATE=`date -j -v+1d "+%s"`
 	atf_check -s exit:0 ${PW} useradd test -p ${DATE}
 	atf_check -s exit:0 -o match:"^test:\*:.*::${DATE}:0:.*" \
 		${PW} usershow test
 }
 
 # Test add user with password expiration as a DD-MM-YYYY date
 atf_test_case user_add_password_expiration_date_numeric
 user_add_password_expiration_date_numeric_body() {
 	populate_etc_skel
 
 	DATE=`date -j -v+1d "+%d-%m-%Y"`
 	EPOCH=`date -j -f "%d-%m-%Y %H:%M:%S" "${DATE} 00:00:00" "+%s"`
 	atf_check -s exit:0 ${PW} useradd test -p ${DATE}
 	atf_check -s exit:0 -o match:"^test:\*:.*::${EPOCH}:0:User &:.*" \
 		${PW} usershow test
 }
 
 # Test add user with password expiration as a DD-MMM-YYYY date
 atf_test_case user_add_password_expiration_date_month
 user_add_password_expiration_date_month_body() {
 	populate_etc_skel
 
 	DATE=`date -j -v+1d "+%d-%b-%Y"`
 	EPOCH=`date -j -f "%d-%b-%Y %H:%M:%S" "${DATE} 00:00:00" "+%s"`
 	atf_check -s exit:0 ${PW} useradd test -p ${DATE}
 	atf_check -s exit:0 -o match:"^test:\*:.*::${EPOCH}:0:User &:.*" \
 		${PW} usershow test
 }
 
 # Test add user with password expiration as a relative date
 atf_test_case user_add_password_expiration_date_relative
 user_add_password_expiration_date_relative_body() {
 	populate_etc_skel
 
 	EPOCH=`date -j -v+13m "+%s"`
 	BUF=`expr $EPOCH + 5`
 	atf_check -s exit:0 ${PW} useradd test -p +13o
 	TIME=`${PW} usershow test | awk -F ':' '{print $6}'`
 	[ ! -z $TIME -a $TIME -ge $EPOCH -a $TIME -lt $BUF ] || \
 		atf_fail "Expiration time($TIME) was not within $EPOCH - $BUF seconds."
 }
 
 atf_test_case user_add_name_too_long
 user_add_name_too_long_body() {
 	populate_etc_skel
 	atf_check -e match:"too long" -s exit:64 \
 		${PW} useradd name_very_vert_very_very_very_long
 }
 
 atf_test_case user_add_expiration
 user_add_expiration_body() {
 	populate_etc_skel
 
 	atf_check -s exit:0 \
 		${PW} useradd foo -e 20-03-2043
 	atf_check -o inline:"foo:*:1001:1001::0:2310422400:User &:/home/foo:/bin/sh\n" \
 		-s exit:0 grep "^foo" ${HOME}/master.passwd
 	atf_check -s exit:0 ${PW} userdel foo
 	atf_check -s exit:0 \
 		${PW} useradd foo -e 20-03-43
 	atf_check -o inline:"foo:*:1001:1001::0:2310422400:User &:/home/foo:/bin/sh\n" \
 		-s exit:0 grep "^foo" ${HOME}/master.passwd
 	atf_check -s exit:0 ${PW} userdel foo
 	atf_check -s exit:0 \
 		${PW} useradd foo -e 20-Mar-2043
 	atf_check -o inline:"foo:*:1001:1001::0:2310422400:User &:/home/foo:/bin/sh\n" \
 		-s exit:0 grep "^foo" ${HOME}/master.passwd
 	atf_check -s exit:0 ${PW} userdel foo
 	atf_check -e inline:"pw: Invalid date\n" -s exit:1 \
 		${PW} useradd foo -e 20-Foo-2043
 	atf_check -e inline:"pw: Invalid date\n" -s exit:1 \
 		${PW} useradd foo -e 20-13-2043
 	atf_check -s exit:0 ${PW} useradd foo -e "12:00 20-03-2043"
 	atf_check -s exit:0 ${PW} userdel foo
 	atf_check -e inline:"pw: Invalid date\n" -s exit:1 \
 		${PW} useradd foo -e "12 20-03-2043"
 	atf_check -s exit:0 ${PW} useradd foo -e "20-03-2043	12:00"
 	atf_check -s exit:0 ${PW} userdel foo
 }
 
+atf_test_case user_add_invalid_user_entry
+user_add_invalid_user_entry_body() {
+	touch ${HOME}/master.passwd
+	touch ${HOME}/group
+
+	pwd_mkdb -p -d ${HOME} ${HOME}/master.passwd || \
+		atf_fail "generate passwd from master.passwd"
+	atf_check -s exit:0 ${PW} useradd foo
+	echo "foo1:*:1002" >> ${HOME}/master.passwd
+	atf_check -s exit:1 -e match:"Invalid user entry" ${PW} useradd foo2
+}
+
+atf_test_case user_add_invalid_group_entry
+user_add_invalid_group_entry_body() {
+	touch ${HOME}/master.passwd
+	touch ${HOME}/group
+
+	pwd_mkdb -p -d ${HOME} ${HOME}/master.passwd || \
+		atf_fail "generate passwd from master.passwd"
+	atf_check -s exit:0 ${PW} useradd foo
+	echo 'foo1:*:1002' >> group
+	atf_check -s exit:1 -e match:"Invalid group entry" ${PW} useradd foo2
+}
+
 atf_init_test_cases() {
 	atf_add_test_case user_add
 	atf_add_test_case user_add_noupdate
 	atf_add_test_case user_add_comments
 	atf_add_test_case user_add_comments_noupdate
 	atf_add_test_case user_add_comments_invalid
 	atf_add_test_case user_add_comments_invalid_noupdate
 	atf_add_test_case user_add_homedir
 	atf_add_test_case user_add_account_expiration_epoch
 	atf_add_test_case user_add_account_expiration_date_numeric
 	atf_add_test_case user_add_account_expiration_date_month
 	atf_add_test_case user_add_account_expiration_date_relative
 	atf_add_test_case user_add_password_expiration_epoch
 	atf_add_test_case user_add_password_expiration_date_numeric
 	atf_add_test_case user_add_password_expiration_date_month
 	atf_add_test_case user_add_password_expiration_date_relative
 	atf_add_test_case user_add_name_too_long
 	atf_add_test_case user_add_expiration
+	atf_add_test_case user_add_invalid_user_entry
+	atf_add_test_case user_add_invalid_group_entry
 }