From cdb63fbc57f0476d2bc332c08d81360910e722da Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sun, 1 Aug 2010 20:16:12 +0000 Subject: Merged revisions 83442 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/release27-maint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ................ r83442 | antoine.pitrou | 2010-08-01 22:13:11 +0200 (dim., 01 août 2010) | 10 lines Merged revisions 83440 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83440 | antoine.pitrou | 2010-08-01 22:08:46 +0200 (dim., 01 août 2010) | 4 lines Issue #8397: Raise an error when attempting to mix iteration and regular reads on a BZ2File object, rather than returning incorrect results. ........ ................ --- Lib/test/test_bz2.py | 18 ++++++++++++++++++ Misc/NEWS | 3 +++ Modules/bz2module.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py index e1e5a28..ee7e886 100644 --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -302,6 +302,24 @@ class BZ2FileTest(BaseTest): finally: f.close() + def testMixedIterationReads(self): + # Issue #8397: mixed iteration and reads should be forbidden. + f = bz2.BZ2File(self.filename, 'wb') + try: + # The internal buffer size is hard-wired to 8192 bytes, we must + # write out more than that for the test to stop half through + # the buffer. + f.write(self.TEXT * 100) + finally: + f.close() + f = bz2.BZ2File(self.filename, 'rb') + try: + next(f) + self.assertRaises(ValueError, f.read) + self.assertRaises(ValueError, f.readline) + self.assertRaises(ValueError, f.readlines) + finally: + f.close() class BZ2CompressorTest(BaseTest): def testCompress(self): diff --git a/Misc/NEWS b/Misc/NEWS index 56b289e..2f25dcb 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -84,6 +84,9 @@ C-API Library ------- +- Issue #8397: Raise an error when attempting to mix iteration and regular + reads on a BZ2File object, rather than returning incorrect results. + - 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/bz2module.c b/Modules/bz2module.c index dcb5dc6..cfd8d71 100644 --- a/Modules/bz2module.c +++ b/Modules/bz2module.c @@ -144,6 +144,22 @@ typedef struct { /* ===================================================================== */ /* Utility functions. */ +/* Refuse regular I/O if there's data in the iteration-buffer. + * Mixing them would cause data to arrive out of order, as the read* + * methods don't use the iteration buffer. */ +static int +check_iterbuffered(BZ2FileObject *f) +{ + if (f->f_buf != NULL && + (f->f_bufend - f->f_bufptr) > 0 && + f->f_buf[0] != '\0') { + PyErr_SetString(PyExc_ValueError, + "Mixing iteration and read methods would lose data"); + return -1; + } + return 0; +} + static int Util_CatchBZ2Error(int bzerror) { @@ -527,6 +543,10 @@ BZ2File_read(BZ2FileObject *self, PyObject *args) goto cleanup; } + /* refuse to mix with f.next() */ + if (check_iterbuffered(self)) + goto cleanup; + if (bytesrequested < 0) buffersize = Util_NewBufferSize((size_t)0); else @@ -612,6 +632,10 @@ BZ2File_readline(BZ2FileObject *self, PyObject *args) goto cleanup; } + /* refuse to mix with f.next() */ + if (check_iterbuffered(self)) + goto cleanup; + if (sizehint == 0) ret = PyString_FromString(""); else @@ -669,6 +693,10 @@ BZ2File_readlines(BZ2FileObject *self, PyObject *args) goto cleanup; } + /* refuse to mix with f.next() */ + if (check_iterbuffered(self)) + goto cleanup; + if ((list = PyList_New(0)) == NULL) goto cleanup; -- cgit v0.12