Merge branch 'strto-detect-endptr' into 'master'

Fix strtol/ul endptr with detected base See merge request redox-os/relibc!656
2025-05-02 10:36:05 -06:00
parent 863171105d de3dd54266
commit a2e040ce4d
7 changed files with 113 additions and 26 deletions
@@ -171,8 +171,10 @@ macro_rules! strto_impl {
        // convert the string to a number
        let num_str = $s.offset(idx);
        let res = match $base {
-            0 => detect_base(num_str)
-                .and_then(|($base, i)| convert_integer(num_str.offset(i), $base)),
+            0 => detect_base(num_str).and_then(|($base, i)| {
+                idx += i;
+                convert_integer(num_str.offset(i), $base)
+            }),
            8 => convert_octal(num_str),
            16 => convert_hex(num_str),
            _ => convert_integer(num_str, $base),