diff options
| author | Ross Lagerwall <rosslagerwall@gmail.com> | 2011-06-25 08:11:44 (GMT) |
|---|---|---|
| committer | Ross Lagerwall <rosslagerwall@gmail.com> | 2011-06-25 08:11:44 (GMT) |
| commit | 1db37f3248697d0a6fa24cea6b7112651f0e4abb (patch) | |
| tree | d6744f3de96718d6885228d1ba40881e56e15ec0 | |
| parent | e71db4450cc3ede22dbfda7c7eb9149cf685650f (diff) | |
| parent | dbfb9b89db6cf2f1bc63c9be9bfab476d7141181 (diff) | |
| download | cpython-1db37f3248697d0a6fa24cea6b7112651f0e4abb.zip cpython-1db37f3248697d0a6fa24cea6b7112651f0e4abb.tar.gz cpython-1db37f3248697d0a6fa24cea6b7112651f0e4abb.tar.bz2 | |
Merge with 3.2 (Issue #12404).
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/mmapmodule.c | 3 |
2 files changed, 5 insertions, 1 deletions
@@ -200,6 +200,9 @@ Core and Builtins Library ------- +- Issue #12404: Remove C89 incompatible code from mmap module. Patch by Akira + Kitada. + - Issue #1874: email now detects and reports as a defect the presence of any CTE other than 7bit, 8bit, or binary on a multipart. diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index ab12e2c..5d086a7 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -1162,12 +1162,13 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict) # endif if (fd != -1 && fstat(fd, &st) == 0 && S_ISREG(st.st_mode)) { if (map_size == 0) { + off_t calc_size; if (offset >= st.st_size) { PyErr_SetString(PyExc_ValueError, "mmap offset is greater than file size"); return NULL; } - off_t calc_size = st.st_size - offset; + calc_size = st.st_size - offset; map_size = calc_size; if (map_size != calc_size) { PyErr_SetString(PyExc_ValueError, |