* passwd.cc (pwdgrp::parse_passwd): Be more unforgiving about non-numeric

fields.
This commit is contained in:
Christopher Faylor 2003-01-27 17:00:17 +00:00
parent ca6018a0d3
commit dfb366da5a
2 changed files with 9 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2003-01-27 Christopher Faylor <cgf@redhat.com>
* passwd.cc (pwdgrp::parse_passwd): Be more unforgiving about
non-numeric fields.
2003-01-26 Christopher Faylor <cgf@redhat.com>
* uinfo.cc (pwdgrp::next_num): Remove check for NULL since it is no

View File

@ -40,11 +40,10 @@ pwdgrp::parse_passwd ()
# define res (*passwd_buf)[curr_lines]
res.pw_name = next_str (':');
res.pw_passwd = next_str (':');
char *p = raw_ptr ();
(void) next_num (res.pw_uid);
if (p == raw_ptr ())
return false; /* parsing did not advance. line is garbage */
(void) next_num (res.pw_gid);
if (!next_num (res.pw_uid))
return false;
if (!next_num (res.pw_gid))
return false;
res.pw_comment = NULL;
res.pw_gecos = next_str (':');
res.pw_dir = next_str (':');