Merged revisions 83407 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83407 | brian.curtin | 2010-08-01 10:26:26 -0500 (Sun, 01 Aug 2010) | 3 lines
Fix #8105. Add validation to mmap.mmap so invalid file descriptors
don't cause a crash on Windows.
........
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 @@
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);