From 423be95dcf55b0b8737207beb7b30eb549430dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Wed, 13 Aug 2008 15:53:07 +0000 Subject: 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*. ........ --- Modules/_struct.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Modules/_struct.c') diff --git a/Modules/_struct.c b/Modules/_struct.c index 43be9ed0a5..4a257c0097 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1567,11 +1567,11 @@ s_unpack(PyObject *self, PyObject *input) PyErr_Format(StructError, "unpack requires a bytes argument of length %zd", soself->s_size); - PyObject_ReleaseBuffer(input, &vbuf); + PyBuffer_Release(&vbuf); return NULL; } result = s_unpack_internal(soself, vbuf.buf); - PyObject_ReleaseBuffer(input, &vbuf); + PyBuffer_Release(&vbuf); return result; } @@ -1609,11 +1609,11 @@ s_unpack_from(PyObject *self, PyObject *args, PyObject *kwds) PyErr_Format(StructError, "unpack_from requires a buffer of at least %zd bytes", soself->s_size); - PyObject_ReleaseBuffer(input, &vbuf); + PyBuffer_Release(&vbuf); return NULL; } result = s_unpack_internal(soself, (char*)vbuf.buf + offset); - PyObject_ReleaseBuffer(input, &vbuf); + PyBuffer_Release(&vbuf); return result; } -- cgit v1.2.1