diff options
| -rw-r--r-- | Lib/test/test_mmap.py | 12 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/mmapmodule.c | 5 |
3 files changed, 18 insertions, 1 deletions
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py index eae4157..b3869a6 100644 --- a/Lib/test/test_mmap.py +++ b/Lib/test/test_mmap.py @@ -1,6 +1,6 @@ from test.support import TESTFN, run_unittest, import_module import unittest -import os, re, itertools +import os, re, itertools, socket # Skip test if we can't import mmap. mmap = import_module('mmap') @@ -586,6 +586,16 @@ class MmapTests(unittest.TestCase): pass m.close() + def test_invalid_descriptor(self): + # socket file descriptors are valid, but out of range + # for _get_osfhandle, causing a crash when validating the + # parameters to _get_osfhandle. + s = socket.socket() + try: + with self.assertRaises(mmap.error): + m = mmap.mmap(s.fileno(), 10) + finally: + s.close() def test_main(): run_unittest(MmapTests) @@ -332,6 +332,8 @@ Library Extension Modules ----------------- +- Issue #8105: Validate file descriptor passed to mmap.mmap on Windows. + - Issue #9422: Fix memory leak when re-initializing a struct.Struct object. - Issue #7900: The getgroups(2) system call on MacOSX behaves rather oddly diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index 9714ddf..b170b38 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -1203,6 +1203,11 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict) 1); */ if (fileno != -1 && fileno != 0) { + /* Ensure that fileno is within the CRT's valid range */ + if (_PyVerify_fd(fileno) == 0) { + PyErr_SetFromErrno(mmap_module_error); + return NULL; + } fh = (HANDLE)_get_osfhandle(fileno); if (fh==(HANDLE)-1) { PyErr_SetFromErrno(mmap_module_error); |