diff Include/object.h @ 48683:cd3b0b7fd8e1

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*. ........
author Martin v. Löwis <martin@v.loewis.de>
date Wed, 13 Aug 2008 15:53:07 +0000
parents 85b67fb5672b
children 548dccc4008e
line wrap: on
line diff
--- a/Include/object.h	Tue Aug 12 17:09:27 2008 +0000
+++ b/Include/object.h	Wed Aug 13 15:53:07 2008 +0000
@@ -142,7 +142,8 @@
 
 /* buffer interface */
 typedef struct bufferinfo {
-	void *buf;         
+	void *buf;   
+	PyObject *obj;        /* borrowed reference */
         Py_ssize_t len;
         Py_ssize_t itemsize;  /* This is Py_ssize_t so it can be 
                                  pointed to by strides in simple case.*/