Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-129813, PEP 782: Use PyBytesWriter in socket recvmsg() #139131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
Sep 18, 2025
Merged

gh-129813, PEP 782: Use PyBytesWriter in socket recvmsg() #139131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
gh-129813, PEP 782: Use PyBytesWriter in socket recvmsg() 
Replace PyBytes_FromStringAndSize(NULL, size) and _PyBytes_Resize()
with the new public PyBytesWriter API.
  • Loading branch information
@vstinner
vstinner committed Sep 18, 2025
commit 9d076245c741df9a62047a12495d65327354d4fc
32 changes: 16 additions & 16 deletions Modules/socketmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4425,43 +4425,43 @@ sock_recvmsg_guts(PySocketSockObject *s, struct iovec *iov, int iovlen,
static PyObject *
makeval_recvmsg(ssize_t received, void *data)
{
PyObject **buf = data;

if (received < PyBytes_GET_SIZE(*buf))
_PyBytes_Resize(buf, received);
return Py_XNewRef(*buf);
PyBytesWriter **writer = data;
PyObject *buf = PyBytesWriter_FinishWithSize(*writer, received);
*writer = NULL;
return buf;
}

/* s.recvmsg(bufsize[, ancbufsize[, flags]]) method */

static PyObject *
sock_recvmsg(PyObject *self, PyObject *args)
{
PySocketSockObject *s = _PySocketSockObject_CAST(self);

Py_ssize_t bufsize, ancbufsize = 0;
int flags = 0;
struct iovec iov;
PyObject *buf = NULL, *retval = NULL;

if (!PyArg_ParseTuple(args, "n|ni:recvmsg", &bufsize, &ancbufsize, &flags))
return NULL;

if (bufsize < 0) {
PyErr_SetString(PyExc_ValueError, "negative buffer size in recvmsg()");
return NULL;
}
if ((buf = PyBytes_FromStringAndSize(NULL, bufsize)) == NULL)

PyBytesWriter *writer = PyBytesWriter_Create(bufsize);
if (writer == NULL) {
return NULL;
iov.iov_base = PyBytes_AS_STRING(buf);
}
struct iovec iov;
iov.iov_base = PyBytesWriter_GetData(writer);
iov.iov_len = bufsize;

/* Note that we're passing a pointer to *our pointer* to the bytes
object here (&buf); makeval_recvmsg() may incref the object, or
deallocate it and set our pointer to NULL. */
writer (&writer); makeval_recvmsg() finish it and set our pointer to
NULL. */
PyObject *retval;
PySocketSockObject *s = _PySocketSockObject_CAST(self);
retval = sock_recvmsg_guts(s, &iov, 1, flags, ancbufsize,
&makeval_recvmsg, &buf);
Py_XDECREF(buf);
&makeval_recvmsg, &writer);
PyBytesWriter_Discard(writer);
return retval;
}

Expand Down
Loading