summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-01-17 13:37:57 +0000
committerMark Dickinson <dickinsm@gmail.com>2010-01-17 13:37:57 +0000
commit23df3d270d3572c43638d15b63684405b66887f7 (patch)
tree2103008213a5cb1b593797cd138d18b188b3b737
parent724c5b2e7ffa2c676c17458ad55b3f13d4a9b6d4 (diff)
downloadcpython-git-23df3d270d3572c43638d15b63684405b66887f7.tar.gz
Issue #7632: Fix a memory leak in _Py_dg_strtod.
-rw-r--r--Misc/NEWS5
-rw-r--r--Python/dtoa.c8
2 files changed, 10 insertions, 3 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 4806f2626c..7ff642014c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -25,8 +25,9 @@ Core and Builtins
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 #7319, #7770: Silence DeprecationWarning by default when -3 is not
used.
diff --git a/Python/dtoa.c b/Python/dtoa.c
index 9eb8cdba89..24ce922607 100644
--- a/Python/dtoa.c
+++ b/Python/dtoa.c
@@ -1939,8 +1939,14 @@ _Py_dg_strtod(const char *s00, char **se)
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;