[Python-checkins] r68771 - in python/branches/release30-maint: Lib/test/test_fileio.py Misc/NEWS Modules/_fileio.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Mon Jan 19 16:35:29 2009
New Revision: 68771

Log:
Merged revisions 68767,68769-68770 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r68767 | benjamin.peterson | 2009-01-19 09:11:51 -0600 (Mon, 19 Jan 2009) | 9 lines
  
  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
  ........
................
  r68769 | benjamin.peterson | 2009-01-19 09:15:02 -0600 (Mon, 19 Jan 2009) | 1 line
  
  reenable the invalid fd test for fdopen
................
  r68770 | benjamin.peterson | 2009-01-19 09:19:46 -0600 (Mon, 19 Jan 2009) | 1 line
  
  fix compiler warning
................


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/test/test_fileio.py
   python/branches/release30-maint/Misc/NEWS
   python/branches/release30-maint/Modules/_fileio.c

Modified: python/branches/release30-maint/Lib/test/test_fileio.py
==============================================================================
--- python/branches/release30-maint/Lib/test/test_fileio.py	(original)
+++ python/branches/release30-maint/Lib/test/test_fileio.py	Mon Jan 19 16:35:29 2009
@@ -175,6 +175,10 @@
         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"

Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Mon Jan 19 16:35:29 2009
@@ -12,6 +12,8 @@
 Core and Builtins
 -----------------
 
+- Issue #4991: os.fdopen now raises an OSError for invalid file descriptors.
+
 - Issue #4838: When a module is deallocated, free the memory backing the
   optional module state data.
 

Modified: python/branches/release30-maint/Modules/_fileio.c
==============================================================================
--- python/branches/release30-maint/Modules/_fileio.c	(original)
+++ python/branches/release30-maint/Modules/_fileio.c	Mon Jan 19 16:35:29 2009
@@ -60,7 +60,7 @@
 internal_close(PyFileIOObject *self)
 {
 	int err = 0;
-	int save_errno;
+	int save_errno = 0;
 	if (self->fd >= 0) {
 		int fd = self->fd;
 		self->fd = -1;
@@ -138,6 +138,24 @@
 	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)
@@ -170,6 +188,8 @@
 					"Negative filedescriptor");
 			return -1;
 		}
+		if (check_fd(fd))
+			return -1;
 	}
 	else {
 		PyErr_Clear();