From 47d027ee1a44829819c345287623fe75374893ab Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 14 Jul 2011 22:11:00 -0400 Subject: fix various bugs in new integer parser framework 1. my interpretation of subject sequence definition was wrong. adjust parser to conform to the standard. 2. some code for handling tail overflow case was missing (forgot to finish writing it). 3. typo (= instead of ==) caused ERANGE to wrongly behave like EINVAL --- src/stdlib/strtoimax.c | 2 +- src/stdlib/strtoumax.c | 2 +- src/stdlib/wcstoimax.c | 5 +++-- src/stdlib/wcstoumax.c | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src/stdlib') diff --git a/src/stdlib/strtoimax.c b/src/stdlib/strtoimax.c index 247f91d4..671aa287 100644 --- a/src/stdlib/strtoimax.c +++ b/src/stdlib/strtoimax.c @@ -25,7 +25,7 @@ intmax_t strtoimax(const char *s1, char **p, int base) if (ip.err) { errno = ip.err; - if (ip.err = EINVAL) return 0; + if (ip.err == EINVAL) return 0; return ip.neg ? INTMAX_MIN : INTMAX_MAX; } diff --git a/src/stdlib/strtoumax.c b/src/stdlib/strtoumax.c index a2bb4d7d..a299dc04 100644 --- a/src/stdlib/strtoumax.c +++ b/src/stdlib/strtoumax.c @@ -26,7 +26,7 @@ uintmax_t strtoumax(const char *s1, char **p, int base) if (ip.err) { errno = ip.err; - if (ip.err = EINVAL) return 0; + if (ip.err == EINVAL) return 0; return UINTMAX_MAX; } diff --git a/src/stdlib/wcstoimax.c b/src/stdlib/wcstoimax.c index 50647f62..344fe3a3 100644 --- a/src/stdlib/wcstoimax.c +++ b/src/stdlib/wcstoimax.c @@ -6,6 +6,7 @@ intmax_t wcstoimax(const wchar_t *s, wchar_t **p, int base) { + const wchar_t *s1 = s; struct intparse ip = {0}; if (p) *p = (wchar_t *)s; @@ -21,11 +22,11 @@ intmax_t wcstoimax(const wchar_t *s, wchar_t **p, int base) for (; __intparse(&ip, (char[]){(*s&-(*s<128U))}, 1); s++); if (p && ip.err != EINVAL) - *p = (wchar_t *)s; + *p = (wchar_t *)s1 + ip.cnt; if (ip.err) { errno = ip.err; - if (ip.err = EINVAL) return 0; + if (ip.err == EINVAL) return 0; return ip.neg ? INTMAX_MIN : INTMAX_MAX; } diff --git a/src/stdlib/wcstoumax.c b/src/stdlib/wcstoumax.c index af7ba3dc..cee5ff7f 100644 --- a/src/stdlib/wcstoumax.c +++ b/src/stdlib/wcstoumax.c @@ -7,6 +7,7 @@ uintmax_t wcstoumax(const wchar_t *s, wchar_t **p, int base) { + const wchar_t *s1 = s; struct intparse ip = {0}; if (p) *p = (wchar_t *)s; @@ -22,11 +23,11 @@ uintmax_t wcstoumax(const wchar_t *s, wchar_t **p, int base) for (; __intparse(&ip, (char[]){(*s&-(*s<128U))}, 1); s++); if (p && ip.err != EINVAL) - *p = (wchar_t *)s; + *p = (wchar_t *)s1 + ip.cnt; if (ip.err) { errno = ip.err; - if (ip.err = EINVAL) return 0; + if (ip.err == EINVAL) return 0; return UINTMAX_MAX; } -- cgit v1.2.1