[Python-checkins] r83412 - in python/branches/release27-maint: Misc/NEWS Modules/_io/bufferedio.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Sun Aug  1 18:57:17 2010
New Revision: 83412

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


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Misc/NEWS
   python/branches/release27-maint/Modules/_io/bufferedio.c

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Sun Aug  1 18:57:17 2010
@@ -24,6 +24,9 @@
 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.
 

Modified: python/branches/release27-maint/Modules/_io/bufferedio.c
==============================================================================
--- python/branches/release27-maint/Modules/_io/bufferedio.c	(original)
+++ python/branches/release27-maint/Modules/_io/bufferedio.c	Sun Aug  1 18:57:17 2010
@@ -636,6 +636,8 @@
         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");