mirror of
https://github.com/python/cpython.git
synced 2025-12-04 00:30:19 +00:00
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*.
This commit is contained in:
parent
aa8efbf084
commit
f91d46a17d
16 changed files with 460 additions and 273 deletions
|
|
@ -6334,15 +6334,16 @@ Write a string to a file descriptor.");
|
|||
static PyObject *
|
||||
posix_write(PyObject *self, PyObject *args)
|
||||
{
|
||||
Py_buffer pbuf;
|
||||
int fd;
|
||||
Py_ssize_t size;
|
||||
char *buffer;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "is#:write", &fd, &buffer, &size))
|
||||
if (!PyArg_ParseTuple(args, "is*:write", &fd, &pbuf))
|
||||
return NULL;
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
size = write(fd, buffer, (size_t)size);
|
||||
size = write(fd, pbuf.buf, (size_t)pbuf.len);
|
||||
Py_END_ALLOW_THREADS
|
||||
PyBuffer_Release(&pbuf);
|
||||
if (size < 0)
|
||||
return posix_error();
|
||||
return PyInt_FromSsize_t(size);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue