Skip to content
Merged
Changes from all commits
Commits
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
32 changes: 16 additions & 16 deletions Modules/socketmodule.c
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