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*.
........
diff --git a/Include/abstract.h b/Include/abstract.h
index 9a1003b..46a6f54 100644
--- a/Include/abstract.h
+++ b/Include/abstract.h
@@ -526,24 +526,6 @@
*/
- PyAPI_FUNC(void) PyObject_ReleaseBuffer(PyObject *obj, Py_buffer *view);
-
-
- /* C-API version of the releasebuffer function call. It
- checks to make sure the object has the required function
- pointer and issues the call. The obj must have the buffer
- interface or this function will cause a segfault (i.e. it
- is assumed to be called only after a corresponding
- getbuffer which already verified the existence of the
- tp_as_buffer pointer).
-
- Returns 0 on success and -1 (with an error raised) on
- failure. This function always succeeds (as a NO-OP) if
- there is no releasebuffer function for the object so that
- it can always be called when the consumer is done with the
- buffer
- */
-
PyAPI_FUNC(void *) PyBuffer_GetPointer(Py_buffer *view, Py_ssize_t *indices);
/* Get the memory area pointed to by the indices for the buffer given.
@@ -600,7 +582,7 @@
per element.
*/
- PyAPI_FUNC(int) PyBuffer_FillInfo(Py_buffer *view, void *buf,
+ PyAPI_FUNC(int) PyBuffer_FillInfo(Py_buffer *view, PyObject *o, void *buf,
Py_ssize_t len, int readonly,
int flags);
@@ -610,6 +592,10 @@
and -1 (with raising an error) on error.
*/
+ PyAPI_FUNC(void) PyBuffer_Release(Py_buffer *view);
+
+ /* Releases a Py_buffer obtained from getbuffer ParseTuple's s*.
+ */
PyAPI_FUNC(PyObject *) PyObject_Format(PyObject* obj,
PyObject *format_spec);