https://github.com/python/cpython/commit/d6a6fe2a5b83a4429ffb63b916a8062adb015e06
commit: d6a6fe2a5b83a4429ffb63b916a8062adb015e06
branch: main
author: Victor Stinner <[email protected]>
committer: vstinner <[email protected]>
date: 2025-09-18T14:25:31+02:00
summary:
gh-129813, PEP 782: Use PyBytesWriter in ssl.MemoryBIO (#139113)
Replace PyBytes_FromStringAndSize(NULL, size) and _PyBytes_Resize()
with the new public PyBytesWriter API.
files:
M Modules/_ssl.c
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 0f1d007e47de2a..1f31c2fee5b8e9 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -5848,30 +5848,29 @@ _ssl_MemoryBIO_read_impl(PySSLMemoryBIO *self, int len)
/*[clinic end generated code: output=a657aa1e79cd01b3 input=21046f2d7dac3a90]*/
{
int avail, nbytes;
- PyObject *result;
avail = (int)Py_MIN(BIO_ctrl_pending(self->bio), INT_MAX);
if ((len < 0) || (len > avail))
len = avail;
- result = PyBytes_FromStringAndSize(NULL, len);
- if ((result == NULL) || (len == 0))
- return result;
+ if (len == 0) {
+ return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
+ }
+
+ PyBytesWriter *writer = PyBytesWriter_Create(len);
+ if (writer == NULL) {
+ return NULL;
+ }
- nbytes = BIO_read(self->bio, PyBytes_AS_STRING(result), len);
+ nbytes = BIO_read(self->bio, PyBytesWriter_GetData(writer), len);
if (nbytes < 0) {
_sslmodulestate *state = get_state_mbio(self);
- Py_DECREF(result);
+ PyBytesWriter_Discard(writer);
_setSSLError(state, NULL, 0, __FILE__, __LINE__);
return NULL;
}
- /* There should never be any short reads but check anyway. */
- if (nbytes < len) {
- _PyBytes_Resize(&result, nbytes);
- }
-
- return result;
+ return PyBytesWriter_FinishWithSize(writer, nbytes);
}
/*[clinic input]
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
