diff options
| author | Ross Lagerwall <rosslagerwall@gmail.com> | 2012-08-24 11:32:14 (GMT) |
|---|---|---|
| committer | Ross Lagerwall <rosslagerwall@gmail.com> | 2012-08-24 11:32:14 (GMT) |
| commit | a4b070102aa3444ce7196fd8aa607ad5ea41da25 (patch) | |
| tree | 3e59970d3bba0d740a139d02cd098b62c190b136 | |
| parent | ffffa8e8b212006b9fcd859d2bbf22456542a9a2 (diff) | |
| parent | f2b34b8b9669598d4294488cf3bb8ab4465b7097 (diff) | |
| download | cpython-a4b070102aa3444ce7196fd8aa607ad5ea41da25.zip cpython-a4b070102aa3444ce7196fd8aa607ad5ea41da25.tar.gz cpython-a4b070102aa3444ce7196fd8aa607ad5ea41da25.tar.bz2 | |
Merge with 3.2
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/_posixsubprocess.c | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -29,6 +29,8 @@ Core and Builtins Library ------- +- Issue #15777: Fix a refleak in _posixsubprocess. + - Issue ##665194: Update email.utils.localtime to use datetime.astimezone and correctly handle historic changes in UTC offsets. diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c index b8fb72f..8f0fcf2 100644 --- a/Modules/_posixsubprocess.c +++ b/Modules/_posixsubprocess.c @@ -568,8 +568,10 @@ subprocess_fork_exec(PyObject* self, PyObject *args) } exec_array = _PySequence_BytesToCharpArray(executable_list); - if (!exec_array) + if (!exec_array) { + Py_XDECREF(gc_module); return NULL; + } /* Convert args and env into appropriate arguments for exec() */ /* These conversions are done in the parent process to avoid allocating |