From 607951d405d7afd8a17408aa9c0e10f44f505c8c Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sun, 1 Aug 2010 16:57:17 +0000 Subject: [PATCH] Merged revisions 83411 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ 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. ........ --- Misc/NEWS | 3 +++ Modules/_io/bufferedio.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index 713e42293e5..6c51aa6608b 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -24,6 +24,9 @@ Core and Builtins 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 #8471: In doctest, properly reset the output stream to an empty string when Unicode was previously output. diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index feee9be0087..9a14d26590e 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -636,6 +636,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");