From e6ebcdaa54d2527b1ae94fd95f5ee96dfdc9abe4 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sat, 4 Sep 2010 21:24:42 +0000 Subject: Merged revisions 84506 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84506 | antoine.pitrou | 2010-09-04 22:53:29 +0200 (sam., 04 sept. 2010) | 5 lines Issue #8734: Avoid crash in msvcrt.get_osfhandle() when an invalid file descriptor is provided. Patch by Pascal Chambon. ........ --- Lib/test/test_fileio.py | 3 +++ Misc/NEWS | 3 +++ PC/msvcrtmodule.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py index 930b654..2760b73 100644 --- a/Lib/test/test_fileio.py +++ b/Lib/test/test_fileio.py @@ -312,6 +312,9 @@ class OtherFileTests(unittest.TestCase): def testInvalidFd(self): self.assertRaises(ValueError, _FileIO, -10) self.assertRaises(OSError, _FileIO, make_bad_fd()) + if sys.platform == 'win32': + import msvcrt + self.assertRaises(IOError, msvcrt.get_osfhandle, make_bad_fd()) def testBadModeArgument(self): # verify that we get a sensible error message for bad mode argument diff --git a/Misc/NEWS b/Misc/NEWS index 8ac6168..b205fa5 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -228,6 +228,9 @@ Library Extension Modules ----------------- +- Issue #8734: Avoid crash in msvcrt.get_osfhandle() when an invalid file + descriptor is provided. Patch by Pascal Chambon. + - Issue #7736: Release the GIL around calls to opendir() and closedir() in the posix module. Patch by Marcin Bachry. diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c index 68b7d24..057900d 100755 --- a/PC/msvcrtmodule.c +++ b/PC/msvcrtmodule.c @@ -141,6 +141,9 @@ msvcrt_get_osfhandle(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args,"i:get_osfhandle", &fd)) return NULL; + if (!_PyVerify_fd(fd)) + return PyErr_SetFromErrno(PyExc_IOError); + handle = _get_osfhandle(fd); if (handle == -1) return PyErr_SetFromErrno(PyExc_IOError); -- cgit v0.12