merge 3.5

This commit is contained in:
Benjamin Peterson 2016-10-05 23:29:16 -07:00
commit 43441c77b5
1 changed files with 3 additions and 1 deletions

View File

@ -383,8 +383,10 @@ mmap_write_method(mmap_object *self,
if (!PyArg_ParseTuple(args, "y*:write", &data)) if (!PyArg_ParseTuple(args, "y*:write", &data))
return(NULL); return(NULL);
if (!is_writable(self)) if (!is_writable(self)) {
PyBuffer_Release(&data);
return NULL; return NULL;
}
if (self->pos > self->size || self->size - self->pos < data.len) { if (self->pos > self->size || self->size - self->pos < data.len) {
PyBuffer_Release(&data); PyBuffer_Release(&data);