[Python-checkins] r77421 - python/trunk/Python/dtoa.c
mark.dickinson
python-checkins at python.org
Mon Jan 11 18:15:13 CET 2010
Author: mark.dickinson
Date: Mon Jan 11 18:15:13 2010
New Revision: 77421
Log:
Change a variable type to avoid signed overflow; replace repeated '19999' constant by a define.
Modified:
python/trunk/Python/dtoa.c
Modified: python/trunk/Python/dtoa.c
==============================================================================
--- python/trunk/Python/dtoa.c (original)
+++ python/trunk/Python/dtoa.c Mon Jan 11 18:15:13 2010
@@ -200,6 +200,13 @@
#define STRTOD_DIGLIM 40
#endif
+/* maximum permitted exponent value for strtod; exponents larger than
+ MAX_ABS_EXP in absolute value get truncated to +-MAX_ABS_EXP. MAX_ABS_EXP
+ should fit into an int. */
+#ifndef MAX_ABS_EXP
+#define MAX_ABS_EXP 19999U
+#endif
+
/* The following definition of Storeinc is appropriate for MIPS processors.
* An alternative that might be better on some machines is
* #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
@@ -1305,9 +1312,8 @@
int esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
const char *s, *s0, *s1;
double aadj, aadj1;
- Long L;
U aadj2, adj, rv, rv0;
- ULong y, z;
+ ULong y, z, L;
BCinfo bc;
Bigint *bb, *bb1, *bd, *bd0, *bs, *delta;
@@ -1406,11 +1412,11 @@
s1 = s;
while((c = *++s) >= '0' && c <= '9')
L = 10*L + c - '0';
- if (s - s1 > 8 || L > 19999)
+ if (s - s1 > 8 || L > MAX_ABS_EXP)
/* Avoid confusion from exponents
* so large that e might overflow.
*/
- e = 19999; /* safe for 16 bit ints */
+ e = (int)MAX_ABS_EXP; /* safe for 16 bit ints */
else
e = (int)L;
if (esign)
More information about the Python-checkins
mailing list