[Python-checkins] r83409 - in python/branches/release31-maint: Lib/test/test_mmap.py Misc/NEWS Modules/mmapmodule.c
brian.curtin
python-checkins at python.org
Sun Aug 1 17:44:11 CEST 2010
Author: brian.curtin
Date: Sun Aug 1 17:44:11 2010
New Revision: 83409
Log:
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.
........
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Lib/test/test_mmap.py
python/branches/release31-maint/Misc/NEWS
python/branches/release31-maint/Modules/mmapmodule.c
Modified: python/branches/release31-maint/Lib/test/test_mmap.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_mmap.py (original)
+++ python/branches/release31-maint/Lib/test/test_mmap.py Sun Aug 1 17:44:11 2010
@@ -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 @@
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)
Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS (original)
+++ python/branches/release31-maint/Misc/NEWS Sun Aug 1 17:44:11 2010
@@ -332,6 +332,8 @@
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
Modified: python/branches/release31-maint/Modules/mmapmodule.c
==============================================================================
--- python/branches/release31-maint/Modules/mmapmodule.c (original)
+++ python/branches/release31-maint/Modules/mmapmodule.c Sun Aug 1 17:44:11 2010
@@ -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);
More information about the Python-checkins
mailing list