From 480e28538d42b9cf8e8b2163bfa9e23e27b80793 Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Wed, 8 Jun 2016 17:47:26 -0400 Subject: Issue #27066: Fixed SystemError if a custom opener (for open()) returns a negative number without setting an exception. --- Lib/test/test_io.py | 16 ++++++++++++++++ Misc/NEWS | 3 +++ Modules/_io/fileio.c | 7 ++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index 7323198..000b525 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -805,6 +805,22 @@ class IOTest(unittest.TestCase): with self.open("non-existent", "r", opener=opener) as f: self.assertEqual(f.read(), "egg\n") + def test_bad_opener_negative_1(self): + # Issue #27066. + def badopener(fname, flags): + return -1 + with self.assertRaises(ValueError) as cm: + open('non-existent', 'r', opener=badopener) + self.assertEqual(str(cm.exception), 'opener returned -1') + + def test_bad_opener_other_negative(self): + # Issue #27066. + def badopener(fname, flags): + return -2 + with self.assertRaises(ValueError) as cm: + open('non-existent', 'r', opener=badopener) + self.assertEqual(str(cm.exception), 'opener returned -2') + def test_fileio_closefd(self): # Issue #4841 with self.open(__file__, 'rb') as f1, \ diff --git a/Misc/NEWS b/Misc/NEWS index 1e5f7d3..e16fa19 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Release date: tba Core and Builtins ----------------- +- Issue #27066: Fixed SystemError if a custom opener (for open()) returns a + negative number without setting an exception. + - Issue #20041: Fixed TypeError when frame.f_trace is set to None. Patch by Xavier de Gaye. diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c index 83b6a32..3d41d81 100644 --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -421,7 +421,12 @@ _io_FileIO___init___impl(fileio *self, PyObject *nameobj, const char *mode, self->fd = _PyLong_AsInt(fdobj); Py_DECREF(fdobj); - if (self->fd == -1) { + if (self->fd < 0) { + if (!PyErr_Occurred()) { + /* The opener returned -1. See issue #27066 */ + PyErr_Format(PyExc_ValueError, + "opener returned %d", self->fd); + } goto error; } } -- cgit v0.12