diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-03-06 00:50:56 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-03-06 00:50:56 (GMT) |
| commit | 80d3610bc36e484fbe7b7ccce366a73314505a16 (patch) | |
| tree | c556a1c12243ab1aff37c19cb4f12a83fafd9d50 | |
| parent | d1b1991fd426259c20ef044388235af5cc689a7c (diff) | |
| parent | 7b50c2c6aed2754f205835420d7450f2e401ebfd (diff) | |
| download | cpython-80d3610bc36e484fbe7b7ccce366a73314505a16.zip cpython-80d3610bc36e484fbe7b7ccce366a73314505a16.tar.gz cpython-80d3610bc36e484fbe7b7ccce366a73314505a16.tar.bz2 | |
Merge fix for issue #11391
| -rw-r--r-- | Lib/test/test_mmap.py | 8 | ||||
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | Modules/mmapmodule.c | 15 |
3 files changed, 22 insertions, 5 deletions
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py index cbef374..9b7100d 100644 --- a/Lib/test/test_mmap.py +++ b/Lib/test/test_mmap.py @@ -234,6 +234,14 @@ class MmapTests(unittest.TestCase): flags=mmap.MAP_PRIVATE, prot=mmap.PROT_READ, access=mmap.ACCESS_WRITE) + # Try writing with PROT_EXEC and without PROT_WRITE + prot = mmap.PROT_READ | getattr(mmap, 'PROT_EXEC', 0) + with open(TESTFN, "r+b") as f: + m = mmap.mmap(f.fileno(), mapsize, prot=prot) + self.assertRaises(TypeError, m.write, b"abcdef") + self.assertRaises(TypeError, m.write_byte, 0) + m.close() + def test_bad_file_desc(self): # Try opening a bad file descriptor... self.assertRaises(mmap.error, mmap.mmap, -2, 4096) @@ -31,6 +31,10 @@ Core and Builtins Library ------- +- Issue #11391: Writing to a mmap object created with + ``mmap.PROT_READ|mmap.PROT_EXEC`` would segfault instead of raising a + TypeError. Patch by Charles-François Natali. + - Issue #11306: mailbox in certain cases adapts to an inability to open certain files in read-write mode. Previously it detected this by checking for EACCES, now it also checks for EROFS. diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index 02e0989..fdf3922 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -1106,17 +1106,22 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict) prot = PROT_READ | PROT_WRITE; break; case ACCESS_DEFAULT: - /* use the specified or default values of flags and prot */ + /* map prot to access type */ + if ((prot & PROT_READ) && (prot & PROT_WRITE)) { + /* ACCESS_DEFAULT */ + } + else if (prot & PROT_WRITE) { + access = ACCESS_WRITE; + } + else { + access = ACCESS_READ; + } break; default: return PyErr_Format(PyExc_ValueError, "mmap invalid access parameter."); } - if (prot == PROT_READ) { - access = ACCESS_READ; - } - #ifdef HAVE_FSTAT # ifdef __VMS /* on OpenVMS we must ensure that all bytes are written to the file */ |