From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 1 Aug 2010 16:57:42 +0000 (+0000)
Subject: Merged revisions 83411 via svnmerge from
X-Git-Tag: v3.1.3rc1~446
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6df1ee171967b05186de1111810e184adbe5bfa;p=python

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.
........
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 7cf087b3f7..6e52ecb104 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 b21ea71813..c0c3acc5eb 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");