[locale] Corrected return value check.
Checks
| Context |
Check |
Description |
| dj/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
| dj/TryBot-32bit |
success
|
Build for i686
|
Commit Message
strtol returns LONG_MAX or LONG_MIN on
ERANGE error.
strtoul can return ULONG_MAX on ERANGE error.
This issue was found by SVACE static analyzer.
---
locale/programs/ld-collate.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
@@ -1344,12 +1344,12 @@ order for `%.*s' already defined at %s:%Zu"),
errno = 0;
from = strtol (startp->name + preflen, &cp, base);
- if ((from == UINT_MAX && errno == ERANGE) || *cp != '\0')
+ if (((from == LONG_MAX || from == LONG_MIN ) && errno == ERANGE) || *cp != '\0')
goto invalid_range;
errno = 0;
to = strtol (endp->name + preflen, &cp, base);
- if ((to == UINT_MAX && errno == ERANGE) || *cp != '\0')
+ if (((to == LONG_MAX || to == LONG_MIN ) && errno == ERANGE) || *cp != '\0')
goto invalid_range;
/* Copy the prefix. */
@@ -2934,13 +2934,13 @@ collate_read (struct linereader *ldfile, struct localedef_t *result,
symbol[symbol_len] = '\0';
from = strtoul (&symbol[prefixlen], &endp,
ellipsis == tok_ellipsis2 ? 16 : 10);
- if (*endp != '\0')
+ if ((from == ULONG_MAX && errno == ERANGE) || *endp != '\0')
goto col_sym_inv_range;
endsymbol[symbol_len] = '\0';
to = strtoul (&endsymbol[prefixlen], &endp,
ellipsis == tok_ellipsis2 ? 16 : 10);
- if (*endp != '\0')
+ if ((to == ULONG_MAX && errno == ERANGE) || *endp != '\0')
goto col_sym_inv_range;
if (from > to)