Skip to content

gh-129813, PEP 782: Use PyBytesWriter in _ssl #138929

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
merged 1 commit into from
Sep 18, 2025
Merged

gh-129813, PEP 782: Use PyBytesWriter in _ssl #138929

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
22 changes: 12 additions & 10 deletions Modules/_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2891,7 +2891,7 @@ _ssl__SSLSocket_read_impl(PySSLSocket *self, Py_ssize_t len,
int group_right_1, Py_buffer *buffer)
/*[clinic end generated code: output=49b16e6406023734 input=80ed30436df01a71]*/
{
PyObject *dest = NULL;
PyBytesWriter *writer = NULL;
char *mem;
size_t count = 0;
int retval;
Expand All @@ -2918,14 +2918,16 @@ _ssl__SSLSocket_read_impl(PySSLSocket *self, Py_ssize_t len,
}

if (!group_right_1) {
dest = PyBytes_FromStringAndSize(NULL, len);
if (dest == NULL)
goto error;
if (len == 0) {
Py_XDECREF(sock);
return dest;
return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
}

writer = PyBytesWriter_Create(len);
if (writer == NULL) {
goto error;
}
mem = PyBytes_AS_STRING(dest);
mem = PyBytesWriter_GetData(writer);
}
else {
mem = buffer->buf;
Expand Down Expand Up @@ -3003,8 +3005,7 @@ _ssl__SSLSocket_read_impl(PySSLSocket *self, Py_ssize_t len,
done:
Py_XDECREF(sock);
if (!group_right_1) {
_PyBytes_Resize(&dest, count);
return dest;
return PyBytesWriter_FinishWithSize(writer, count);
}
else {
return PyLong_FromSize_t(count);
Expand All @@ -3013,8 +3014,9 @@ _ssl__SSLSocket_read_impl(PySSLSocket *self, Py_ssize_t len,
error:
PySSL_ChainExceptions(self);
Py_XDECREF(sock);
if (!group_right_1)
Py_XDECREF(dest);
if (!group_right_1) {
PyBytesWriter_Discard(writer);
}
return NULL;
}

Expand Down
Loading