From 7bc8ccd46ff502c9509f116f45e20a4201958366 Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Sat, 28 Dec 2013 21:48:56 +0100
Subject: [PATCH] Fix unportable gid_t and uid_t parsing in fgetpwent_r(3).

---
 libc/pwd/fgetpwent_r.cpp | 44 ++++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/libc/pwd/fgetpwent_r.cpp b/libc/pwd/fgetpwent_r.cpp
index 626f108c..11239a42 100644
--- a/libc/pwd/fgetpwent_r.cpp
+++ b/libc/pwd/fgetpwent_r.cpp
@@ -49,19 +49,41 @@ static char* next_field(char** current)
 	return result;
 }
 
-static id_t next_field_id(char** current)
+static bool next_field_uintmax(char** current, uintmax_t* result)
 {
 	char* id_str = next_field(current);
 	if ( !id_str )
-		return -1;
+		return false;
 	char* id_endptr;
-	intmax_t id_imax = strtoimax(id_str, &id_endptr, 10);
-	if ( id_imax < 0 || *id_endptr )
-		return -1;
-	id_t id = (id_t) id_imax;
-	if ( id != id_imax )
-		return -1;
-	return id;
+	uintmax_t id_umax = strtoumax(id_str, &id_endptr, 10);
+	if ( *id_endptr )
+		return false;
+	*result = id_umax;
+	return true;
+}
+
+static gid_t next_field_gid(char** current, gid_t* result)
+{
+	uintmax_t id_umax;
+	if ( !next_field_uintmax(current, &id_umax) )
+		return false;
+	gid_t gid = (gid_t) id_umax;
+	if ( (uintmax_t) gid != (uintmax_t) id_umax )
+		return false;
+	*result = gid;
+	return true;
+}
+
+static uid_t next_field_uid(char** current, uid_t* result)
+{
+	uintmax_t id_umax;
+	if ( !next_field_uintmax(current, &id_umax) )
+		return false;
+	uid_t uid = (uid_t) id_umax;
+	if ( (uintmax_t) uid != (uintmax_t) id_umax )
+		return false;
+	*result = uid;
+	return true;
 }
 
 extern "C"
@@ -132,9 +154,9 @@ int fgetpwent_r(FILE* restrict fp,
 		goto parse_failure;
 	if ( !(result->pw_passwd = next_field(&parse_str)) )
 		goto parse_failure;
-	if ( (result->pw_uid = next_field_id(&parse_str)) < 0 )
+	if ( !next_field_uid(&parse_str, &result->pw_uid) )
 		goto parse_failure;
-	if ( !(result->pw_gid = next_field_id(&parse_str)) < 0 )
+	if ( !next_field_gid(&parse_str, &result->pw_gid) )
 		goto parse_failure;
 	if ( !(result->pw_gecos = next_field(&parse_str)) )
 		goto parse_failure;