diff options
| author | Georg Brandl <georg@python.org> | 2005-08-24 07:17:35 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2005-08-24 07:17:35 (GMT) |
| commit | a6161e476dc862464f8c55a92bc101d8241af54f (patch) | |
| tree | b329934de126809265e649c3a3da992e63aeaef8 /Modules | |
| parent | 98fa1ca6cacde3af0bce3dfcf753a0048d742854 (diff) | |
| download | cpython-a6161e476dc862464f8c55a92bc101d8241af54f.zip cpython-a6161e476dc862464f8c55a92bc101d8241af54f.tar.gz cpython-a6161e476dc862464f8c55a92bc101d8241af54f.tar.bz2 | |
backport bug [ 728515 ] mmap's resize method resizes the file in win32 but not unix
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/mmapmodule.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index e1a2f42..a3a9857 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -421,6 +421,11 @@ mmap_resize_method(mmap_object *self, return NULL; #else } else { + if (ftruncate(self->fd, new_size) == -1) { + PyErr_SetFromErrno(mmap_module_error); + return NULL; + } + void *newmap; #ifdef MREMAP_MAYMOVE @@ -907,7 +912,12 @@ new_mmap_object(PyObject *self, PyObject *args, PyObject *kwdict) if (m_obj == NULL) {return NULL;} m_obj->size = (size_t) map_size; m_obj->pos = (size_t) 0; - m_obj->fd = fd; + m_obj->fd = dup(fd); + if (m_obj->fd == -1) { + Py_DECREF(m_obj); + PyErr_SetFromErrno(mmap_module_error); + return NULL; + } m_obj->data = mmap(NULL, map_size, prot, flags, fd, 0); |