diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-08-01 16:57:42 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-08-01 16:57:42 (GMT) |
| commit | f6df1ee171967b05186de1111810e184adbe5bfa (patch) | |
| tree | 0f0ec9f1cdebbf8ebb25ef7e8e7078e25d625434 | |
| parent | 686ee4fd3db413b24c49e5a6331d3ba5fb5d9b05 (diff) | |
| download | cpython-f6df1ee171967b05186de1111810e184adbe5bfa.zip cpython-f6df1ee171967b05186de1111810e184adbe5bfa.tar.gz cpython-f6df1ee171967b05186de1111810e184adbe5bfa.tar.bz2 | |
Merged revisions 83411 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83411 | antoine.pitrou | 2010-08-01 18:53:42 +0200 (dim., 01 août 2010) | 4 lines
Issue #9448: Fix a leak of OS resources (mutexes or semaphores) when
re-initializing a buffered IO object by calling its `__init__` method.
........
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_io/bufferedio.c | 2 |
2 files changed, 5 insertions, 0 deletions
@@ -84,6 +84,9 @@ C-API Library ------- +- Issue #9448: Fix a leak of OS resources (mutexes or semaphores) when + re-initializing a buffered IO object by calling its ``__init__`` method. + - Issue #8620: when a Cmd is fed input that reaches EOF without a final newline, it no longer truncates the last character of the last command line. diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index b21ea71..c0c3acc 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -632,6 +632,8 @@ _buffered_init(buffered *self) return -1; } #ifdef WITH_THREAD + if (self->lock) + PyThread_free_lock(self->lock); self->lock = PyThread_allocate_lock(); if (self->lock == NULL) { PyErr_SetString(PyExc_RuntimeError, "can't allocate read lock"); |