Issue 12404: Remove C89 incompatible code from mmap module.

Patch by Akira Kitada.
This commit is contained in:
Ross Lagerwall 2011-06-25 10:02:37 +02:00
parent e697e3750f
commit dbfb9b89db
2 changed files with 5 additions and 1 deletions

View file

@ -25,6 +25,9 @@ Core and Builtins
Library
-------
- Issue #12404: Remove C89 incompatible code from mmap module. Patch by Akira
Kitada.
- Issue #12383: Fix subprocess module with env={}: don't copy the environment
variables, start with an empty environment.

View file

@ -1140,12 +1140,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,