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

fields.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9657420..a7464a1 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -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

diff --git a/winsup/cygwin/passwd.cc b/winsup/cygwin/passwd.cc
index c257bd6..ee12392 100644 (file)
--- a/winsup/cygwin/passwd.cc
+++ b/winsup/cygwin/passwd.cc
@@ -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 (':');