- Issue #3309: Fix bz2.BZFile itererator to release its internal lock

properly when raising an exception due to the bz2file being closed.
  Prevents a deadlock.
This commit is contained in:
Gregory P. Smith 2008-07-07 04:31:58 +00:00
parent 0f7cddc308
commit 3b1e6b2f83
3 changed files with 16 additions and 0 deletions

View File

@ -112,6 +112,17 @@ class BZ2FileTest(BaseTest):
self.assertEqual(list(iter(bz2f)), sio.readlines())
bz2f.close()
def testClosedIteratorDeadlock(self):
# "Test that iteration on a closed bz2file releases the lock."
# http://bugs.python.org/issue3309
self.createTempFile()
bz2f = BZ2File(self.filename)
bz2f.close()
self.assertRaises(ValueError, bz2f.next)
# This call will deadlock of the above .next call failed to
# release the lock.
self.assertRaises(ValueError, bz2f.readlines)
def testXReadLines(self):
# "Test BZ2File.xreadlines()"
self.createTempFile()

View File

@ -68,6 +68,10 @@ Library
- Issue #2113: Fix error in subprocess.Popen if the select system call is
interrupted by a signal.
- Issue #3309: Fix bz2.BZFile itererator to release its internal lock
properly when raising an exception due to the bz2file being closed.
Prevents a deadlock.
Build
-----

View File

@ -1451,6 +1451,7 @@ BZ2File_iternext(BZ2FileObject *self)
PyStringObject* ret;
ACQUIRE_LOCK(self);
if (self->mode == MODE_CLOSED) {
RELEASE_LOCK(self);
PyErr_SetString(PyExc_ValueError,
"I/O operation on closed file");
return NULL;