Mercurial > cpython-lru_cache-weakref
diff Python/dtoa.c @ 58277:2a9f66df4dc4 legacy-trunk
Issue #7632: Fix a problem with _Py_dg_strtod that could lead to
crashes in debug builds, for certain long numeric strings
corresponding to subnormal values.
| author | Mark Dickinson <dickinsm@gmail.com> |
|---|---|
| date | Tue, 12 Jan 2010 22:23:56 +0000 |
| parents | 33e402909cf2 |
| children | b4f301cea115 |
line wrap: on
line diff
--- a/Python/dtoa.c Tue Jan 12 22:02:10 2010 +0000 +++ b/Python/dtoa.c Tue Jan 12 22:23:56 2010 +0000 @@ -1142,7 +1142,7 @@ dsign = bc->dsign; nd = bc->nd; nd0 = bc->nd0; - p5 = nd + bc->e0 - 1; + p5 = nd + bc->e0; speccase = 0; if (rv->d == 0.) { /* special case: value near underflow-to-zero */ /* threshold was rounded to zero */ @@ -1227,17 +1227,21 @@ } } - /* Now b/d = exactly half-way between the two floating-point values */ - /* on either side of the input string. Compute first digit of b/d. */ - - if (!(dig = quorem(b,d))) { - b = multadd(b, 10, 0); /* very unlikely */ - if (b == NULL) { - Bfree(d); - return -1; - } - dig = quorem(b,d); + /* Now 10*b/d = exactly half-way between the two floating-point values + on either side of the input string. If b >= d, round down. */ + if (cmp(b, d) >= 0) { + dd = -1; + goto ret; } + + /* Compute first digit of 10*b/d. */ + b = multadd(b, 10, 0); + if (b == NULL) { + Bfree(d); + return -1; + } + dig = quorem(b, d); + assert(dig < 10); /* Compare b/d with s0 */
