public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin] Return EINVAL for illegal base in strtol
@ 2019-12-17 9:08 Corinna Vinschen
0 siblings, 0 replies; only message in thread
From: Corinna Vinschen @ 2019-12-17 9:08 UTC (permalink / raw)
To: newlib-cvs
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=2635b580ec16aff4230c6ff5fb35c965bf30a251
commit 2635b580ec16aff4230c6ff5fb35c965bf30a251
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 16 13:55:30 2019 -0800
Return EINVAL for illegal base in strtol
Signed-off-by: Keith Packard <keithp@keithp.com>
Diff:
---
newlib/libc/stdlib/strtol.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/newlib/libc/stdlib/strtol.c b/newlib/libc/stdlib/strtol.c
index f7572b1..897890f 100644
--- a/newlib/libc/stdlib/strtol.c
+++ b/newlib/libc/stdlib/strtol.c
@@ -140,6 +140,11 @@ _strtol_l (struct _reent *rptr, const char *__restrict nptr,
register unsigned long cutoff;
register int neg = 0, any, cutlim;
+ if (base < 0 || base == 1 || base > 36) {
+ errno = EINVAL;
+ return 0;
+ }
+
/*
* Skip white space and pick up leading +/- sign if any.
* If base is 0, allow 0x for hex and 0 for octal, else
@@ -193,9 +198,9 @@ _strtol_l (struct _reent *rptr, const char *__restrict nptr,
break;
if (c >= base)
break;
- if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
+ if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim)) {
any = -1;
- else {
+ } else {
any = 1;
acc *= base;
acc += c;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-12-17 9:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-17 9:08 [newlib-cygwin] Return EINVAL for illegal base in strtol Corinna Vinschen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).