Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-105927: _ssl uses _PyWeakref_GET_REF() (#105965)

This commit is contained in:
Victor Stinner 2023-06-21 16:33:32 +02:00 committed by GitHub
parent c5a722be5f
commit 74da6f7c9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Modules/_ssl.c
View File

@ -14,6 +14,10 @@
http://bugs.python.org/issue8108#msg102867 ?
*/
#ifndef Py_BUILD_CORE_BUILTIN
# define Py_BUILD_CORE_MODULE 1
#endif
/* Don't warn about deprecated functions, */
#ifndef OPENSSL_API_COMPAT
// 0x10101000L == 1.1.1, 30000 == 3.0.0
@ -24,6 +28,7 @@
#define PY_SSIZE_T_CLEAN
#include "Python.h"
#include "pycore_weakref.h" // _PyWeakref_GET_REF()
/* Include symbols from _socket module */
#include "socketmodule.h"
@ -379,8 +384,14 @@ typedef enum {
#define ERRSTR(x) ERRSTR1("_ssl.c", Py_STRINGIFY(__LINE__), x)
/* Get the socket from a PySSLSocket, if it has one */
#define GET_SOCKET(obj) ((obj)->Socket ? \
(PySocketSockObject *) PyWeakref_GetObject((obj)->Socket) : NULL)
static inline PySocketSockObject* GET_SOCKET(PySSLSocket *obj) {
if (obj->Socket) {
return (PySocketSockObject *)PyWeakref_GetObject(obj->Socket);
}
else {
return NULL;
}
}
/* If sock is NULL, use a timeout of 0 second */
#define GET_SOCKET_TIMEOUT(sock) \
@ -2177,13 +2188,14 @@ PyDoc_STRVAR(PySSL_get_server_hostname_doc,
static PyObject *
PySSL_get_owner(PySSLSocket *self, void *c)
{
PyObject *owner;
if (self->owner == NULL)
if (self->owner == NULL) {
Py_RETURN_NONE;
owner = PyWeakref_GetObject(self->owner);
return Py_NewRef(owner);
}
PyObject *owner = _PyWeakref_GET_REF(self->owner);
if (owner == NULL) {
Py_RETURN_NONE;
}
return owner;
}
static int
@ -4393,14 +4405,13 @@ _servername_callback(SSL *s, int *al, void *args)
* will be passed. If both do not exist only then the C-level object is
* passed. */
if (ssl->owner)
ssl_socket = PyWeakref_GetObject(ssl->owner);
ssl_socket = _PyWeakref_GET_REF(ssl->owner);
else if (ssl->Socket)
ssl_socket = PyWeakref_GetObject(ssl->Socket);
ssl_socket = _PyWeakref_GET_REF(ssl->Socket);
else
ssl_socket = (PyObject *) ssl;
ssl_socket = Py_NewRef(ssl);
Py_INCREF(ssl_socket);
if (ssl_socket == Py_None)
if (ssl_socket == NULL)
goto error;
if (servername == NULL) {

10
Modules/_ssl/debughelpers.c
View File

@ -15,7 +15,6 @@ _PySSL_msg_callback(int write_p, int version, int content_type,
PyGILState_STATE threadstate;
PyObject *res = NULL;
PySSLSocket *ssl_obj = NULL; /* ssl._SSLSocket, borrowed ref */
PyObject *ssl_socket = NULL; /* ssl.SSLSocket or ssl.SSLObject */
int msg_type;
threadstate = PyGILState_Ensure();
@ -27,13 +26,14 @@ _PySSL_msg_callback(int write_p, int version, int content_type,
return;
}
PyObject *ssl_socket; /* ssl.SSLSocket or ssl.SSLObject */
if (ssl_obj->owner)
ssl_socket = PyWeakref_GetObject(ssl_obj->owner);
ssl_socket = _PyWeakref_GET_REF(ssl_obj->owner);
else if (ssl_obj->Socket)
ssl_socket = PyWeakref_GetObject(ssl_obj->Socket);
ssl_socket = _PyWeakref_GET_REF(ssl_obj->Socket);
else
ssl_socket = (PyObject *)ssl_obj;
Py_INCREF(ssl_socket);
ssl_socket = (PyObject *)Py_NewRef(ssl_obj);
assert(ssl_socket != NULL); // _PyWeakref_GET_REF() can return NULL
/* assume that OpenSSL verifies all payload and buf len is of sufficient
length */