diff options
author | Martin Panter <vadmium+py@gmail.com> | 2016-07-11 01:32:09 +0000 |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2016-07-11 01:32:09 +0000 |
commit | e9b081cab28d648b14bace6b419157622d020a90 (patch) | |
tree | 6a7b79876d12313a67f28ec3d660cd976f0a7373 /Modules/_ssl.c | |
parent | ee4c0cd7d94d6402892fb1917cabc7f4881af2fe (diff) | |
parent | c3fa32d1ba04ea7d8d75fcf9da3541ea7243f04b (diff) | |
download | cpython-e9b081cab28d648b14bace6b419157622d020a90.tar.gz |
Issue #23804: Merge SSL recv() fix from 3.5
Diffstat (limited to 'Modules/_ssl.c')
-rw-r--r-- | Modules/_ssl.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 8c3bb7162e..0e979e0305 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -1913,6 +1913,10 @@ _ssl__SSLSocket_read_impl(PySSLSocket *self, int len, int group_right_1, dest = PyBytes_FromStringAndSize(NULL, len); if (dest == NULL) goto error; + if (len == 0) { + Py_XDECREF(sock); + return dest; + } mem = PyBytes_AS_STRING(dest); } else { @@ -1924,6 +1928,10 @@ _ssl__SSLSocket_read_impl(PySSLSocket *self, int len, int group_right_1, "maximum length can't fit in a C 'int'"); goto error; } + if (len == 0) { + count = 0; + goto done; + } } } |