]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-116616: Use relaxed atomic ops to access socket module defaulttimeout (#116623)
authorErlend E. Aasland <erlend@python.org>
Tue, 12 Mar 2024 13:44:39 +0000 (14:44 +0100)
committerGitHub <noreply@github.com>
Tue, 12 Mar 2024 13:44:39 +0000 (14:44 +0100)
Co-authored-by: Sam Gross <colesbury@gmail.com>
Modules/socketmodule.c

index cd9a803648be712b143b58d6914da8244e7f3ba5..7720d59e46590ea6d1d20d6b5910ac436326aa0b 100644 (file)
@@ -1054,8 +1054,8 @@ init_sockobject(socket_state *state, PySocketSockObject *s,
     else
 #endif
     {
-        s->sock_timeout = state->defaulttimeout;
-        if (state->defaulttimeout >= 0) {
+        s->sock_timeout = _Py_atomic_load_int64_relaxed(&state->defaulttimeout);
+        if (s->sock_timeout >= 0) {
             if (internal_setblocking(s, 0) == -1) {
                 return -1;
             }
@@ -6913,11 +6913,12 @@ static PyObject *
 socket_getdefaulttimeout(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     socket_state *state = get_module_state(self);
-    if (state->defaulttimeout < 0) {
+    PyTime_t timeout = _Py_atomic_load_int64_relaxed(&state->defaulttimeout);
+    if (timeout < 0) {
         Py_RETURN_NONE;
     }
     else {
-        double seconds = PyTime_AsSecondsDouble(state->defaulttimeout);
+        double seconds = PyTime_AsSecondsDouble(timeout);
         return PyFloat_FromDouble(seconds);
     }
 }
@@ -6938,7 +6939,7 @@ socket_setdefaulttimeout(PyObject *self, PyObject *arg)
         return NULL;
 
     socket_state *state = get_module_state(self);
-    state->defaulttimeout = timeout;
+    _Py_atomic_store_int64_relaxed(&state->defaulttimeout, timeout);
 
     Py_RETURN_NONE;
 }