Merged revisions 77579 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r77579 | mark.dickinson | 2010-01-17 14:39:12 +0000 (Sun, 17 Jan 2010) | 9 lines
Merged revisions 77578 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77578 | mark.dickinson | 2010-01-17 13:37:57 +0000 (Sun, 17 Jan 2010) | 2 lines
Issue #7632: Fix a memory leak in _Py_dg_strtod.
........
................
diff --git a/Misc/NEWS b/Misc/NEWS
index 1fc9986..ef0e3f0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,8 +21,9 @@
alpha 2, including: (1) a serious 'wrong output' bug that could
occur for long (> 40 digit) input strings, (2) a crash in dtoa.c
that occurred in debug builds when parsing certain long numeric
- strings corresponding to subnormal values, and (3) a number of flaws
- that could lead to incorrectly rounded results.
+ strings corresponding to subnormal values, (3) a memory leak for
+ some values large enough to cause overflow, and (4) a number of
+ flaws that could lead to incorrectly rounded results.
- Issue #7604: Deleting an unset slotted attribute did not raise an
AttributeError.
diff --git a/Python/dtoa.c b/Python/dtoa.c
index 9eb8cdb..24ce922 100644
--- a/Python/dtoa.c
+++ b/Python/dtoa.c
@@ -1939,8 +1939,14 @@
dval(&rv) += adj.d;
if ((word0(&rv) & Exp_mask) >=
Exp_msk1*(DBL_MAX_EXP+Bias-P)) {
- if (word0(&rv0) == Big0 && word1(&rv0) == Big1)
+ if (word0(&rv0) == Big0 && word1(&rv0) == Big1) {
+ Bfree(bb);
+ Bfree(bd);
+ Bfree(bs);
+ Bfree(bd0);
+ Bfree(delta);
goto ovfl;
+ }
word0(&rv) = Big0;
word1(&rv) = Big1;
goto cont;