mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-15 21:44:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Issue #26644: Merge SSL negative read fix from 3.5

Browse source
This commit is contained in:
Martin Panter 2016-03-27 10:40:22 +00:00
commit afd465d497
3 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Modules/_ssl.c
View file

@ -1895,6 +1895,11 @@ _ssl__SSLSocket_read_impl(PySSLSocket *self, int len, int group_right_1,
_PyTime_t timeout, deadline = 0;
int has_timeout;
if (!group_right_1 && len < 0) {
PyErr_SetString(PyExc_ValueError, "size should not be negative");
return NULL;
}
if (sock != NULL) {
if (((PyObject*)sock) == Py_None) {
_setSSLError("Underlying socket connection gone",