Skip to content

gh-105927: _ssl uses _PyWeakref_GET_REF() #105965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 21, 2023
Merged

gh-105927: _ssl uses _PyWeakref_GET_REF() #105965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4aab90b
gh-105927: _ssl uses _PyWeakref_GET_REF()
vstinner Jun 21, 2023
45e73a6
assert != NULL
vstinner Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 24 additions & 13 deletions Modules/_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -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) \
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down
10 changes: 5 additions & 5 deletions Modules/_ssl/debughelpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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 */
Expand Down