fix uid/gid > 2^31

diff --git a/pgrep.c b/pgrep.c
index 1905cd1d54939701b979bba4afe40d187d9c01f8..7d731620131d58b47934d8965e2ee8ca0c6b2595 100644 (file)
--- a/pgrep.c
+++ b/pgrep.c
@@ -229,8 +229,12 @@ static int strict_atol (const char *restrict str, long *restrict value)
 
        for ( ; *str; ++str) {
                if (! isdigit (*str))
-                       return (0);
+                       return 0;
+               if (res >= LONG_MAX / 10)
+                       return 0;
                res *= 10;
+               if (res >= LONG_MAX - (*str - '0'))
+                       return 0;
                res += *str - '0';
        }
        *value = sign * res;
@@ -305,7 +309,7 @@ static int conv_uid (const char *restrict name, struct el *restrict e)
                xwarnx(_("invalid user name: %s"), name);
                return 0;
        }
-       e->num = (int) pwd->pw_uid;
+       e->num = pwd->pw_uid;
        return 1;
 }
 
@@ -322,7 +326,7 @@ static int conv_gid (const char *restrict name, struct el *restrict e)
                xwarnx(_("invalid group name: %s"), name);
                return 0;
        }
-       e->num = (int) grp->gr_gid;
+       e->num = grp->gr_gid;
        return 1;
 }
 

diff --git a/proc/readproc.h b/proc/readproc.h
index 7905ea9994395ae0e5d029aa2987296a89140e49..8d9ae392a8f652247aed6e188d6ce20c4637d096 100644 (file)
--- a/proc/readproc.h
+++ b/proc/readproc.h
@@ -159,12 +159,12 @@ typedef struct proc_t {
        session,        // stat            session id
        nlwp,           // stat,status     number of threads, or 0 if no clue
        tgid,           // (special)       thread group ID, the POSIX PID (see also: tid)
-       tty,            // stat            full device number of controlling terminal
-       /* FIXME: int uids & gids should be uid_t or gid_t from pwd.h */
-        euid, egid,     // stat(),status   effective
-        ruid, rgid,     // status          real
-        suid, sgid,     // status          saved
-        fuid, fgid,     // status          fs (used for file access only)
+       tty;            // stat            full device number of controlling terminal
+    uid_t euid; gid_t egid; // stat(),status effective
+    uid_t ruid; gid_t rgid; // status        real
+    uid_t suid; gid_t sgid; // status        saved
+    uid_t fuid; gid_t fgid; // status        fs (used for file access only)
+    int
        tpgid,          // stat            terminal process group id
        exit_signal,    // stat            might not be SIGCHLD
        processor;      // stat            current (or most recent?) CPU