Commit 18a818b
committed
Fix multiple uses of variable 'L' in _Py_dg_strtod, where one use requires an unsigned long and the other a signed long. See also r77421.
1 parent 811ff82 commit 18a818b
1 file changed
Lines changed: 6 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1345,7 +1345,8 @@ _Py_dg_strtod(const char *s00, char **se) | |||
| 1345 | 1345 | const char *s, *s0, *s1; | |
| 1346 | 1346 | double aadj, aadj1; | |
| 1347 | 1347 | U aadj2, adj, rv, rv0; | |
| 1348 | - ULong y, z, L; | ||
| 1348 | + ULong y, z, abse; | ||
| 1349 | + Long L; | ||
| 1349 | 1350 | BCinfo bc; | |
| 1350 | 1351 | Bigint *bb, *bb1, *bd, *bd0, *bs, *delta; | |
| 1351 | 1352 | ||
@@ -1425,17 +1426,17 @@ _Py_dg_strtod(const char *s00, char **se) | |||
| 1425 | 1426 | while(c == '0') | |
| 1426 | 1427 | c = *++s; | |
| 1427 | 1428 | if (c > '0' && c <= '9') { | |
| 1428 | - L = c - '0'; | ||
| 1429 | + abse = c - '0'; | ||
| 1429 | 1430 | s1 = s; | |
| 1430 | 1431 | while((c = *++s) >= '0' && c <= '9') | |
| 1431 | - L = 10*L + c - '0'; | ||
| 1432 | - if (s - s1 > 8 || L > MAX_ABS_EXP) | ||
| 1432 | + abse = 10*abse + c - '0'; | ||
| 1433 | + if (s - s1 > 8 || abse > MAX_ABS_EXP) | ||
| 1433 | 1434 | /* Avoid confusion from exponents | |
| 1434 | 1435 | * so large that e might overflow. | |
| 1435 | 1436 | */ | |
| 1436 | 1437 | e = (int)MAX_ABS_EXP; /* safe for 16 bit ints */ | |
| 1437 | 1438 | else | |
| 1438 | - e = (int)L; | ||
| 1439 | + e = (int)abse; | ||
| 1439 | 1440 | if (esign) | |
| 1440 | 1441 | e = -e; | |
| 1441 | 1442 | } | |
0 commit comments