Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
ea47eaa3
Commit
ea47eaa3
authored
Aug 01, 2010
by
Brian Curtin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #8105. Add validation to mmap.mmap so invalid file descriptors
don't cause a crash on Windows.
parent
0bccc185
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
1 deletion
+19
-1
Lib/test/test_mmap.py
Lib/test/test_mmap.py
+12
-1
Misc/NEWS
Misc/NEWS
+2
-0
Modules/mmapmodule.c
Modules/mmapmodule.c
+5
-0
No files found.
Lib/test/test_mmap.py
View file @
ea47eaa3
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,17 @@ 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_context_manager
(
self
):
with
mmap
.
mmap
(
-
1
,
10
)
as
m
:
self
.
assertFalse
(
m
.
closed
)
...
...
Misc/NEWS
View file @
ea47eaa3
...
...
@@ -21,6 +21,8 @@ Core and Builtins
Extensions
----------
- Issue #8105: Validate file descriptor passed to mmap.mmap on Windows.
- Issue #8046: Add context manager protocol support and .closed property
to mmap objects.
...
...
Modules/mmapmodule.c
View file @
ea47eaa3
...
...
@@ -1236,6 +1236,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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment