mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-27 05:44:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge 3.5 (#27773)

Browse source
This commit is contained in:
Benjamin Peterson 2016-08-15 21:56:11 -07:00
commit a853c479ee
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -90,6 +90,8 @@ Library
- Issue #6422: Add autorange method to timeit.Timer objects. - Issue #6422: Add autorange method to timeit.Timer objects.
- Issue #27773: Correct some memory management errors server_hostname in _ssl.wrap_socket().
- Issue #26750: unittest.mock.create_autospec() now works properly for - Issue #26750: unittest.mock.create_autospec() now works properly for
subclasses of property() and other data descriptors. Removes the never subclasses of property() and other data descriptors. Removes the never
publicly used, never documented unittest.mock.DescriptorTypes tuple. publicly used, never documented unittest.mock.DescriptorTypes tuple.

10
Modules/_ssl.c
View file

@ -487,7 +487,6 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
{ {
PySSLSocket *self; PySSLSocket *self;
SSL_CTX *ctx = sslctx->ctx; SSL_CTX *ctx = sslctx->ctx;
PyObject *hostname;
long mode; long mode;
self = PyObject_New(PySSLSocket, &PySSLSocket_Type); self = PyObject_New(PySSLSocket, &PySSLSocket_Type);
@ -501,16 +500,16 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
self->shutdown_seen_zero = 0; self->shutdown_seen_zero = 0;
self->handshake_done = 0; self->handshake_done = 0;
self->owner = NULL; self->owner = NULL;
self->server_hostname = NULL;
if (server_hostname != NULL) { if (server_hostname != NULL) {
hostname = PyUnicode_Decode(server_hostname, strlen(server_hostname), PyObject *hostname = PyUnicode_Decode(server_hostname, strlen(server_hostname),
"idna", "strict"); "idna", "strict");
if (hostname == NULL) { if (hostname == NULL) {
Py_DECREF(self); Py_DECREF(self);
return NULL; return NULL;
} }
self->server_hostname = hostname; self->server_hostname = hostname;
} else }
self->server_hostname = NULL;
Py_INCREF(sslctx); Py_INCREF(sslctx);
@ -563,7 +562,6 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
self->Socket = PyWeakref_NewRef((PyObject *) sock, NULL); self->Socket = PyWeakref_NewRef((PyObject *) sock, NULL);
if (self->Socket == NULL) { if (self->Socket == NULL) {
Py_DECREF(self); Py_DECREF(self);
Py_XDECREF(self->server_hostname);
return NULL; return NULL;
} }
} }