diff options
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/canonicalize.c | 6 | ||||
| -rw-r--r-- | stdlib/strtod.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c index a65b7f187c..356c619b5d 100644 --- a/stdlib/canonicalize.c +++ b/stdlib/canonicalize.c @@ -73,7 +73,7 @@ canonicalize (const char *name, char *resolved) /* find end of path component: */ for (end = start; *end && *end != '/'; ++end); - + if (end - start == 0) break; else if (strncmp (start, ".", end - start) == 0) @@ -110,7 +110,7 @@ canonicalize (const char *name, char *resolved) memcpy (dest, start, end - start); dest += end - start; *dest = '\0'; - + if (__lstat (rpath, &st) < 0) goto error; @@ -132,7 +132,7 @@ canonicalize (const char *name, char *resolved) if (!extra_buf) extra_buf = __alloca (path_max); - if (n + strlen (end) >= path_max) + if ((long int) (n + strlen (end)) >= path_max) { errno = ENAMETOOLONG; goto error; diff --git a/stdlib/strtod.c b/stdlib/strtod.c index 6f3ea26c0f..8269010bc3 100644 --- a/stdlib/strtod.c +++ b/stdlib/strtod.c @@ -378,6 +378,8 @@ INTERNAL (STRTOF) (nptr, endptr, group) in the format described in <locale.h>. */ const char *grouping; + assert (sizeof (wchar_t) <= sizeof (wint_t)); + if (group) { grouping = _NL_CURRENT (LC_NUMERIC, GROUPING); |