fix corner cases in the management of server_hostname (closes #27773)
This commit is contained in:
parent
b1c6bdc76a
commit
81b9ecd2a3
|
@ -34,6 +34,8 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- 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.
|
subclasses of property() and other data descriptors.
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue