FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-129813, PEP 782: Use PyBytesWriter in _socket by vstinner · Pull Request #139097 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

gh-129813, PEP 782: Use PyBytesWriter in _socket #139097

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
Conversation 4 Commits 1 Checks 45 Files changed
Merged

gh-129813, PEP 782: Use PyBytesWriter in _socket #139097

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

Filter by extension

Filter by extension .c  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
36 changes: 14 additions & 22 deletions Modules/socketmodule.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -3978,7 +3978,6 @@ sock_recv(PyObject *self, PyObject *args)

Py_ssize_t recvlen, outlen;
int flags = 0;
PyObject *buf;

if (!PyArg_ParseTuple(args, "n|i:recv", &recvlen, &flags))
return NULL;
Expand All @@ -3990,25 +3989,21 @@ sock_recv(PyObject *self, PyObject *args)
}

/* Allocate a new string. */
buf = PyBytes_FromStringAndSize((char *) 0, recvlen);
if (buf == NULL)
PyBytesWriter *writer = PyBytesWriter_Create(recvlen);
if (writer == NULL) {
return NULL;
}

/* Call the guts */
outlen = sock_recv_guts(s, PyBytes_AS_STRING(buf), recvlen, flags);
outlen = sock_recv_guts(s, PyBytesWriter_GetData(writer), recvlen, flags);
if (outlen < 0) {
/* An error occurred, release the string and return an
error. */
Py_DECREF(buf);
PyBytesWriter_Discard(writer);
return NULL;
}
if (outlen != recvlen) {
/* We did not read as many bytes as we anticipated, resize the
string if possible and be successful. */
_PyBytes_Resize(&buf, outlen);
}

return buf;
return PyBytesWriter_FinishWithSize(writer, outlen);
}

PyDoc_STRVAR(recv_doc,
Expand Down Expand Up @@ -4164,7 +4159,6 @@ sock_recvfrom(PyObject *self, PyObject *args)
{
PySocketSockObject *s = _PySocketSockObject_CAST(self);

PyObject *buf = NULL;
PyObject *addr = NULL;
PyObject *ret = NULL;
int flags = 0;
Expand All @@ -4179,28 +4173,26 @@ sock_recvfrom(PyObject *self, PyObject *args)
return NULL;
}

buf = PyBytes_FromStringAndSize((char *) 0, recvlen);
if (buf == NULL)
PyBytesWriter *writer = PyBytesWriter_Create(recvlen);
if (writer == NULL) {
return NULL;
}

outlen = sock_recvfrom_guts(s, PyBytes_AS_STRING(buf),
outlen = sock_recvfrom_guts(s, PyBytesWriter_GetData(writer),
recvlen, flags, &addr);
if (outlen < 0) {
PyBytesWriter_Discard(writer);
goto finally;
}

if (outlen != recvlen) {
/* We did not read as many bytes as we anticipated, resize the
string if possible and be successful. */
if (_PyBytes_Resize(&buf, outlen) < 0)
/* Oopsy, not so successful after all. */
goto finally;
PyObject *buf = PyBytesWriter_FinishWithSize(writer, outlen);
if (buf == NULL) {
goto finally;
}

ret = PyTuple_Pack(2, buf, addr);

finally:
Py_XDECREF(buf);
Py_XDECREF(addr);
return ret;
}
Expand Down
Loading
Back | FazBrowse Home | New Git URL