Issue #26644: Raise ValueError for negative SSLSocket.recv() and read()

This commit is contained in:
Martin Panter 2016-03-27 05:35:19 +00:00
parent 6ce9f4b9a4
commit b8089b4dde
3 changed files with 18 additions and 0 deletions

View File

@ -2622,7 +2622,18 @@ else:
# consume data
s.read()
# read(-1, buffer) is supported, even though read(-1) is not
data = b"data"
s.send(data)
buffer = bytearray(len(data))
self.assertEqual(s.read(-1, buffer), len(data))
self.assertEqual(buffer, data)
s.write(b"over\n")
self.assertRaises(ValueError, s.recv, -1)
self.assertRaises(ValueError, s.read, -1)
s.close()
def test_handshake_timeout(self):

View File

@ -61,6 +61,9 @@ Core and Builtins
Library
-------
- Issue #26644: Raise ValueError rather than SystemError when a negative
length is passed to SSLSocket.recv() or read().
- Issue #24266: Ctrl+C during Readline history search now cancels the search
mode when compiled with Readline 7.

View File

@ -1695,6 +1695,10 @@ static PyObject *PySSL_SSLread(PySSLSocket *self, PyObject *args)
goto error;
if ((buf.buf == NULL) && (buf.obj == NULL)) {
if (len < 0) {
PyErr_SetString(PyExc_ValueError, "size should not be negative");
goto error;
}
dest = PyBytes_FromStringAndSize(NULL, len);
if (dest == NULL)
goto error;