Issue 12404: Remove C89 incompatible code from mmap module.
Patch by Akira Kitada.
This commit is contained in:
parent
17e2b40aae
commit
ffa8e2fb56
|
@ -16,6 +16,9 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue #12404: Remove C89 incompatible code from mmap module. Patch by Akira
|
||||||
|
Kitada.
|
||||||
|
|
||||||
- Issue #11700: mailbox proxy object close methods can now be called multiple
|
- Issue #11700: mailbox proxy object close methods can now be called multiple
|
||||||
times without error, and _ProxyFile now closes the wrapped file.
|
times without error, and _ProxyFile now closes the wrapped file.
|
||||||
|
|
||||||
|
|
|
@ -1188,12 +1188,13 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict)
|
||||||
# endif
|
# endif
|
||||||
if (fd != -1 && fstat(fd, &st) == 0 && S_ISREG(st.st_mode)) {
|
if (fd != -1 && fstat(fd, &st) == 0 && S_ISREG(st.st_mode)) {
|
||||||
if (map_size == 0) {
|
if (map_size == 0) {
|
||||||
|
off_t calc_size;
|
||||||
if (offset >= st.st_size) {
|
if (offset >= st.st_size) {
|
||||||
PyErr_SetString(PyExc_ValueError,
|
PyErr_SetString(PyExc_ValueError,
|
||||||
"mmap offset is greater than file size");
|
"mmap offset is greater than file size");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
off_t calc_size = st.st_size - offset;
|
calc_size = st.st_size - offset;
|
||||||
map_size = calc_size;
|
map_size = calc_size;
|
||||||
if (map_size != calc_size) {
|
if (map_size != calc_size) {
|
||||||
PyErr_SetString(PyExc_ValueError,
|
PyErr_SetString(PyExc_ValueError,
|
||||||
|
|
Loading…
Reference in New Issue