Changeset 0260034 in mainline for uspace/lib/c/generic/strtol.c

Timestamp:

2019-05-27T16:17:33Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

dd0502ae

Parents:

31a566b

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-05-27 15:44:21)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-05-27 16:17:33)

Message:

Fix and test additional corner cases in strtol()

File:

• uspace/lib/c/generic/strtol.c (modified) (5 diffs)

uspace/lib/c/generic/strtol.c

@@ -77 +77 @@
 
         if (nptr[1] == 'x' || nptr[1] == 'X') {
-                *nptrptr += 2;
-                return 16;
+                if (_digit_value(nptr[2]) < 16) {
+                        *nptrptr += 2;
+                        return 16;
+                }
         }
 
@@ -85 +87 @@
                 case 'b':
                 case 'B':
-                        *nptrptr += 2;
-                        return 2;
+                        if (_digit_value(nptr[2]) < 2) {
+                                *nptrptr += 2;
+                                return 2;
+                        }
+                        break;
                 case 'o':
                 case 'O':
-                        *nptrptr += 2;
-                        return 8;
+                        if (_digit_value(nptr[2]) < 8) {
+                                *nptrptr += 2;
+                                return 8;
+                        }
+                        break;
                 case 'd':
                 case 'D':
                 case 't':
                 case 'T':
-                        *nptrptr += 2;
-                        return 10;
+                        if (_digit_value(nptr[2]) < 10) {
+                                *nptrptr += 2;
+                                return 10;
+                        }
+                        break;
                 }
         }
@@ -109 +120 @@
         assert(nptr != NULL);
         assert(sgn != NULL);
+
+        const char *first = nptr;
 
         /* Skip leading whitespace. */
@@ -138 +151 @@
                  * present when base is explicitly set to 16.
                  * Our nonstandard str_* functions don't allow it.
+                 * I don't know if that is intended, just matching the original
+                 * functionality here.
                  */
 
-                if (nptr[0] == '0' && (nptr[1] == 'x' || nptr[1] == 'X'))
+                if (nptr[0] == '0' && (nptr[1] == 'x' || nptr[1] == 'X') &&
+                    _digit_value(nptr[2]) < base)
                         nptr += 2;
         }
@@ -149 +165 @@
         }
 
-        /* Read the value. */
+        /* Must be at least one digit. */
+
+        if (_digit_value(*nptr) >= base) {
+                /* No digits on input. */
+                if (endptr != NULL)
+                        *endptr = (char *) first;
+                return 0;
+        }
+
+        /* Read the value.  */
 
         uintmax_t result = 0;