Merged revisions 68755 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68755 | benjamin.peterson | 2009-01-18 18:08:08 -0600 (Sun, 18 Jan 2009) | 1 line

  raise an OSError for invalid fds #4991
........

diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py
index d8cf415ed868748cdd85b8b1e19ca32655372e5f..c089608d3c948fff8e996135c4fdde6d9a852966 100644 (file)
--- a/Lib/test/test_fileio.py
+++ b/Lib/test/test_fileio.py
@@ -176,6 +176,10 @@ class OtherFileTests(unittest.TestCase):
         f.close()
         os.unlink(TESTFN)
 
+    def testInvalidFd(self):
+        self.assertRaises(ValueError, _fileio._FileIO, -10)
+        self.assertRaises(OSError, _fileio._FileIO, 10)
+
     def testBadModeArgument(self):
         # verify that we get a sensible error message for bad mode argument
         bad_mode = "qwerty"

diff --git a/Modules/_fileio.c b/Modules/_fileio.c
index 2dc3d743b85f8279c525df2af15cebcc02d74d4e..0f09ecd8a3b0df09138c8f7084fdca9ece0cb86e 100644 (file)
--- a/Modules/_fileio.c
+++ b/Modules/_fileio.c
@@ -119,6 +119,24 @@ dircheck(PyFileIOObject* self, char *name)
        return 0;
 }
 
+static int
+check_fd(int fd)
+{
+#if defined(HAVE_FSTAT)
+       struct stat buf;
+       if (fstat(fd, &buf) < 0 && errno == EBADF) {
+               PyObject *exc;
+               char *msg = strerror(EBADF);
+               exc = PyObject_CallFunction(PyExc_OSError, "(is)",
+                                           EBADF, msg);
+               PyErr_SetObject(PyExc_OSError, exc);
+               Py_XDECREF(exc);
+               return -1;
+       }
+#endif
+       return 0;
+}
+
 
 static int
 fileio_init(PyObject *oself, PyObject *args, PyObject *kwds)
@@ -151,6 +169,8 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds)
                                        "Negative filedescriptor");
                        return -1;
                }
+               if (check_fd(fd))
+                       return -1;
        }
        else {
                PyErr_Clear();