diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-08-13 15:53:07 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-08-13 15:53:07 (GMT) |
| commit | 423be95dcf55b0b8737207beb7b30eb549430dba (patch) | |
| tree | b23453f2dc43d809aca931203a9580a81bd938fe /Modules/mmapmodule.c | |
| parent | 688356f59f3b0fe2412a5f66b79f0f9fdc4a98d2 (diff) | |
| download | cpython-423be95dcf55b0b8737207beb7b30eb549430dba.zip cpython-423be95dcf55b0b8737207beb7b30eb549430dba.tar.gz cpython-423be95dcf55b0b8737207beb7b30eb549430dba.tar.bz2 | |
Merged revisions 65654 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65654 | martin.v.loewis | 2008-08-12 16:49:50 +0200 (Tue, 12 Aug 2008) | 6 lines
Issue #3139: Make buffer-interface thread-safe wrt. PyArg_ParseTuple,
by denying s# to parse objects that have a releasebuffer procedure,
and introducing s*.
More module might need to get converted to use s*.
........
Diffstat (limited to 'Modules/mmapmodule.c')
| -rw-r--r-- | Modules/mmapmodule.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index 51ad69c..c8dfc24 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -651,7 +651,7 @@ static int mmap_buffer_getbuf(mmap_object *self, Py_buffer *view, int flags) { CHECK_VALID(-1); - if (PyBuffer_FillInfo(view, self->data, self->size, + if (PyBuffer_FillInfo(view, (PyObject*)self, self->data, self->size, (self->access == ACCESS_READ), flags) < 0) return -1; self->exports++; @@ -843,7 +843,7 @@ mmap_ass_subscript(mmap_object *self, PyObject *item, PyObject *value) if (vbuf.len != slicelen) { PyErr_SetString(PyExc_IndexError, "mmap slice assignment is wrong size"); - PyObject_ReleaseBuffer(value, &vbuf); + PyBuffer_Release(&vbuf); return -1; } @@ -862,7 +862,7 @@ mmap_ass_subscript(mmap_object *self, PyObject *item, PyObject *value) self->data[cur] = ((char *)vbuf.buf)[i]; } } - PyObject_ReleaseBuffer(value, &vbuf); + PyBuffer_Release(&vbuf); return 0; } else { |