diff options
| -rw-r--r-- | Lib/test/test_fileio.py | 3 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rwxr-xr-x | PC/msvcrtmodule.c | 3 |
3 files changed, 9 insertions, 0 deletions
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 @@ -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); |