mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merged revisions 66677,66700 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66677 | brett.cannon | 2008-09-28 22:41:21 -0500 (Sun, 28 Sep 2008) | 7 lines

  The _lsprof module could crash the interpreter if it was given an external
  timer that did not return a float and a timer was still running when the
  Profiler object was garbage collected.

  Fixes issue 3895.
  Code review by Benjamin Peterson.
........
  r66700 | brett.cannon | 2008-09-30 12:46:03 -0500 (Tue, 30 Sep 2008) | 5 lines

  Fix a refleak introduced by r66677.

  Fix suggested by Amaury Forgeot d'Arc.
  Closes issue #4003.
........
This commit is contained in:
Benjamin Peterson 2008-10-07 02:32:59 +00:00
parent f259bc42c6
commit 6ccc703865
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/_lsprof.c
View file

@ -150,7 +150,7 @@ static PY_LONG_LONG CallExternalTimer(ProfilerObject *pObj)
}
Py_DECREF(o);
if (PyErr_Occurred()) {
PyErr_WriteUnraisable((PyObject *) pObj);
PyErr_WriteUnraisable(pObj->externalTimer);
return 0;
}
return result;