pw: fail if an invalid entry is found while parsing master.passwd and group

PR:		198554
Reported by:	diaran <fbsd@centraltech.co.uk>
MFC after:	2 days

diff --git a/pw/pw_vpw.c b/pw/pw_vpw.c
index 99663bebded992e5ca78c79522b0f6910d664124..a23c66e111f44dbc127e823ef6e3b92dc367bf53 100644 (file)
--- a/pw/pw_vpw.c
+++ b/pw/pw_vpw.c
@@ -38,6 +38,7 @@ static const char rcsid[] =
 #include <string.h>
 #include <stdlib.h>
 #include <sys/param.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/param.h>

+#include <err.h>

 
 #include "pwupd.h"
 
 
 #include "pwupd.h"
 


@@ -80,6 +81,9 @@ vnextpwent(char const *nam, uid_t uid, int doclose)
                        if (line[linelen - 1 ] == '\n')
                                line[linelen - 1] = '\0';
                        pw = pw_scan(line, PWSCAN_MASTER);
                        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;
                        if (uid != (uid_t)-1) {
                                if (uid == pw->pw_uid)
                                        break;


@@ -160,6 +164,9 @@ vnextgrent(char const *nam, gid_t gid, int doclose)
                        if (line[linelen - 1 ] == '\n')
                                line[linelen - 1] = '\0';
                        gr = gr_scan(line);
                        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;
                        if (gid != (gid_t)-1) {
                                if (gid == gr->gr_gid)
                                        break;