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.
  ........
................
This commit is contained in:
Mark Dickinson 2010-01-17 14:41:03 +00:00
parent 20d6c15327
commit a3ba4a15ec
2 changed files with 10 additions and 3 deletions

View file

@ -21,8 +21,9 @@ Core and Builtins
alpha 2, including: (1) a serious 'wrong output' bug that could alpha 2, including: (1) a serious 'wrong output' bug that could
occur for long (> 40 digit) input strings, (2) a crash in dtoa.c occur for long (> 40 digit) input strings, (2) a crash in dtoa.c
that occurred in debug builds when parsing certain long numeric that occurred in debug builds when parsing certain long numeric
strings corresponding to subnormal values, and (3) a number of flaws strings corresponding to subnormal values, (3) a memory leak for
that could lead to incorrectly rounded results. 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 - Issue #7604: Deleting an unset slotted attribute did not raise an
AttributeError. AttributeError.

View file

@ -1939,8 +1939,14 @@ _Py_dg_strtod(const char *s00, char **se)
dval(&rv) += adj.d; dval(&rv) += adj.d;
if ((word0(&rv) & Exp_mask) >= if ((word0(&rv) & Exp_mask) >=
Exp_msk1*(DBL_MAX_EXP+Bias-P)) { 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; goto ovfl;
}
word0(&rv) = Big0; word0(&rv) = Big0;
word1(&rv) = Big1; word1(&rv) = Big1;
goto cont; goto cont;