Issue #27066: Fixed SystemError if a custom opener (for open()) returns

warsaw · warsaw · commit 480e28538d42 · 2016-06-08T17:47:26.000-04:00
a negative number without setting an exception.
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
@@ -805,6 +805,22 @@ def opener(path, flags):
         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
@@ -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
@@ -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;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,12 @@ _io_FileIO___init___impl(fileio self, PyObject nameobj, const char *mode,`
`421`	`421`
`422`	`422`	`self->fd = _PyLong_AsInt(fdobj);`
`423`	`423`	`Py_DECREF(fdobj);`
`424`		`- if (self->fd == -1) {`
	`424`	`+ if (self->fd < 0) {`
	`425`	`+ if (!PyErr_Occurred()) {`
	`426`	`+ /* The opener returned -1. See issue #27066 */`
	`427`	`+ PyErr_Format(PyExc_ValueError,`
	`428`	`+ "opener returned %d", self->fd);`
	`429`	`+ }`
`425`	`430`	`goto error;`
`426`	`431`	`}`
`427`	`432`	`}`