diff options
author | Brian Curtin <brian.curtin@gmail.com> | 2010-08-01 15:44:11 +0000 |
---|---|---|
committer | Brian Curtin <brian.curtin@gmail.com> | 2010-08-01 15:44:11 +0000 |
commit | fc5d4717aaec0ed1290ce33bf96ffbd22e889e11 (patch) | |
tree | 131e69a36d1da8a7128fdc49868b6bef16233f90 /Lib/test/test_mmap.py | |
parent | 3b4f1f7add586446a2a32b046d7c0fa20bfc1564 (diff) | |
download | cpython-fc5d4717aaec0ed1290ce33bf96ffbd22e889e11.tar.gz |
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.
........
Diffstat (limited to 'Lib/test/test_mmap.py')
-rw-r--r-- | Lib/test/test_mmap.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py index eae4157edc..b3869a6317 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) |