Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions Include/cpython/funcobject.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,14 @@ PyAPI_FUNC(int) PyFunction_SetAnnotations(PyObject *, PyObject *);
/* Static inline functions for direct access to these values.
Type checks are *not* done, so use with care. */
static inline PyObject* PyFunction_GET_CODE(PyObject *func) {
return _PyFunction_CAST(func)->func_code;
PyFunctionObject *op = _PyFunction_CAST(func);
#ifdef Py_GIL_DISABLED
return (PyObject *)_Py_atomic_load_ptr(&op->func_code);
#else
return op->func_code;
#endif
}
#define PyFunction_GET_CODE(func) PyFunction_GET_CODE(_PyObject_CAST(func))

static inline PyObject* PyFunction_GET_GLOBALS(PyObject *func) {
return _PyFunction_CAST(func)->func_globals;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixing race condition in PyFunctionObject.func_code
10 changes: 7 additions & 3 deletions Objects/funcobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,8 @@ func_get_code(PyObject *self, void *Py_UNUSED(ignored))
return NULL;
}

return Py_NewRef(op->func_code);
PyCodeObject *code = _Py_atomic_load_ptr(&op->func_code);
return Py_NewRef(code);
}

static int
Expand Down Expand Up @@ -664,7 +665,7 @@ func_set_code(PyObject *self, PyObject *value, void *Py_UNUSED(ignored))
return -1;
}

PyObject *func_code = PyFunction_GET_CODE(op);
PyCodeObject *func_code = (PyCodeObject *)PyFunction_GET_CODE(op);
int old_flags = ((PyCodeObject *)func_code)->co_flags;
int new_flags = ((PyCodeObject *)value)->co_flags;
int mask = CO_GENERATOR | CO_COROUTINE | CO_ASYNC_GENERATOR;
Expand All @@ -679,7 +680,10 @@ func_set_code(PyObject *self, PyObject *value, void *Py_UNUSED(ignored))

handle_func_event(PyFunction_EVENT_MODIFY_CODE, op, value);
_PyFunction_ClearVersion(op);
Py_XSETREF(op->func_code, Py_NewRef(value));
PyCodeObject *new = (PyCodeObject *)Py_NewRef(value);
PyCodeObject *old =
(PyCodeObject *)_Py_atomic_exchange_ptr(&op->func_code, new);
Py_XDECREF(old);
return 0;
}

Expand Down
Loading