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

gh-129813, PEP 782: Use PyBytesWriter in ssl.MemoryBIO by vstinner · Pull Request #139113 · python/cpython · GitHub

Repository navigation

Merged
Changes from all commits
Commits
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
23 changes: 11 additions & 12 deletions Modules/_ssl.c
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
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Loading

Back | FazBrowse Home | New Git URL