summaryrefslogtreecommitdiffstats
path: root/compat/strtoull.c
diff options
context:
space:
mode:
authorKevin B Kenny <kennykb@acm.org>2002-02-15 23:42:12 (GMT)
committerKevin B Kenny <kennykb@acm.org>2002-02-15 23:42:12 (GMT)
commitb5e9e40d2f0d57b15ea03e954e1c2085b9874fed (patch)
tree87a231b742d00bcbf481e3439acb70032c612370 /compat/strtoull.c
parent097b4b7f2e14a0d47f82c9d8b7579bee651660b4 (diff)
downloadtcl-b5e9e40d2f0d57b15ea03e954e1c2085b9874fed.zip
tcl-b5e9e40d2f0d57b15ea03e954e1c2085b9874fed.tar.gz
tcl-b5e9e40d2f0d57b15ea03e954e1c2085b9874fed.tar.bz2
Further changes to the TIP 72 patch to make it compile under VC++
Diffstat (limited to 'compat/strtoull.c')
-rw-r--r--compat/strtoull.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/compat/strtoull.c b/compat/strtoull.c
index 8658eb0..af508d0 100644
--- a/compat/strtoull.c
+++ b/compat/strtoull.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: strtoull.c,v 1.2 2002/02/15 14:28:47 dkf Exp $
+ * RCS: @(#) $Id: strtoull.c,v 1.3 2002/02/15 23:42:12 kennykb Exp $
*/
#include "tcl.h"
@@ -149,6 +149,9 @@ strtoull(string, endPtr, base)
goto overflow;
}
result = shifted + digit;
+ if ( result < shifted ) {
+ goto overflow;
+ }
anyDigits = 1;
}
} else if (base == 10) {
@@ -162,6 +165,9 @@ strtoull(string, endPtr, base)
goto overflow;
}
result = shifted + digit;
+ if ( result < shifted ) {
+ goto overflow;
+ }
anyDigits = 1;
}
} else if (base == 16) {
@@ -179,16 +185,19 @@ strtoull(string, endPtr, base)
goto overflow;
}
result = shifted + digit;
+ if ( result < shifted ) {
+ goto overflow;
+ }
anyDigits = 1;
}
- } else {
+ } else if ( base >= 2 && base <= 36 ) {
for ( ; ; p += 1) {
digit = *p - '0';
if (digit > ('z' - '0')) {
break;
}
digit = cvtIn[digit];
- if (digit >= base) {
+ if (digit >= (unsigned) base) {
break;
}
shifted = result * base;
@@ -196,6 +205,9 @@ strtoull(string, endPtr, base)
goto overflow;
}
result = shifted + digit;
+ if ( result < shifted ) {
+ goto overflow;
+ }
anyDigits = 1;
}
}
@@ -235,7 +247,7 @@ strtoull(string, endPtr, base)
break;
}
digit = cvtIn[digit];
- if (digit >= base) {
+ if (digit >= (unsigned) base) {
break;
}
}