1 files changed, 9 insertions, 7 deletions

diff --git a/libbb/procps.c b/libbb/procps.c
index 39ddd2c12..dbae46e33 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -128,10 +128,11 @@ static unsigned long fast_strtoul_16(char **endptr)
         char *str = *endptr;
         unsigned long n = 0;
 
-        while ((c = *str++) != ' ') {
+        /* Need to stop on both ' ' and '\n' */
+        while ((c = *str++) > ' ') {
                 c = ((c|0x20) - '0');
                 if (c > 9)
-                        // c = c + '0' - 'a' + 10:
+                        /* c = c + '0' - 'a' + 10: */
                         c = c - ('a' - '0' - 10);
                 n = n*16 + c;
         }
@@ -144,11 +145,12 @@ static unsigned long fast_strtoul_16(char **endptr)
 /* We cut a lot of corners here for speed */
 static unsigned long fast_strtoul_10(char **endptr)
 {
-        char c;
+        unsigned char c;
         char *str = *endptr;
         unsigned long n = *str - '0';
 
-        while ((c = *++str) != ' ')
+        /* Need to stop on both ' ' and '\n' */
+        while ((c = *++str) > ' ')
                 n = n*10 + (c - '0');
 
         *endptr = str + 1; /* We skip trailing space! */
@@ -199,7 +201,7 @@ int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
         memset(&currec, 0, sizeof(currec));
         while (fgets(buf, PROCPS_BUFSIZE, file)) {
                 // Each mapping datum has this form:
-                // f7d29000-f7d39000 rw-s ADR M:m OFS FILE
+                // f7d29000-f7d39000 rw-s FILEOFS M:m INODE FILENAME
                 // Size:                nnn kB
                 // Rss:                 nnn kB
                 // .....
@@ -224,7 +226,7 @@ int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
                 tp = strchr(buf, '-');
                 if (tp) {
                         // We reached next mapping - the line of this form:
-                        // f7d29000-f7d39000 rw-s ADR M:m OFS FILE
+                        // f7d29000-f7d39000 rw-s FILEOFS M:m INODE FILENAME
 
                         if (cb) {
                                 /* If we have a previous record, there's nothing more
@@ -243,7 +245,7 @@ int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
 
                         strncpy(currec.smap_mode, tp, sizeof(currec.smap_mode)-1);
 
-                        // skipping "rw-s ADR M:m OFS "
+                        // skipping "rw-s FILEOFS M:m INODE "
                         tp = skip_whitespace(skip_fields(tp, 4));
                         // filter out /dev/something (something != zero)
                         if (strncmp(tp, "/dev/", 5) != 0 || strcmp(tp, "/dev/zero\n") == 0) {