From 444b39bb64aa894d3f1831210a8ce40042a5a532 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 20 Nov 2019 01:18:11 +0100 Subject: bpo-38631: Avoid Py_FatalError() in handle_legacy_finalizers() (GH-17266) * Rename _PyGC_Initialize() to _PyGC_InitializeRuntime() * Add _PyGC_Init(): initialize _PyRuntime.gc.garbage list * Call _PyGC_Init() before _PyTypes_Init() --- Modules/gcmodule.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'Modules/gcmodule.c') diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c index cb7a3de57a..d2e39371b9 100644 --- a/Modules/gcmodule.c +++ b/Modules/gcmodule.c @@ -25,6 +25,7 @@ #include "Python.h" #include "pycore_context.h" +#include "pycore_initconfig.h" #include "pycore_object.h" #include "pycore_pymem.h" #include "pycore_pystate.h" @@ -129,7 +130,7 @@ static PyObject *gc_str = NULL; #define GEN_HEAD(state, n) (&(state)->generations[n].head) void -_PyGC_Initialize(struct _gc_runtime_state *state) +_PyGC_InitializeRuntime(struct _gc_runtime_state *state) { state->enabled = 1; /* automatic collection enabled? */ @@ -151,6 +152,21 @@ _PyGC_Initialize(struct _gc_runtime_state *state) state->permanent_generation = permanent_generation; } + +PyStatus +_PyGC_Init(_PyRuntimeState *runtime) +{ + struct _gc_runtime_state *state = &runtime->gc; + if (state->garbage == NULL) { + state->garbage = PyList_New(0); + if (state->garbage == NULL) { + return _PyStatus_NO_MEMORY(); + } + } + return _PyStatus_OK(); +} + + /* _gc_prev values --------------- @@ -905,13 +921,9 @@ handle_legacy_finalizers(struct _gc_runtime_state *state, PyGC_Head *finalizers, PyGC_Head *old) { assert(!PyErr_Occurred()); + assert(state->garbage != NULL); PyGC_Head *gc = GC_NEXT(finalizers); - if (state->garbage == NULL) { - state->garbage = PyList_New(0); - if (state->garbage == NULL) - Py_FatalError("gc couldn't create gc.garbage list"); - } for (; gc != finalizers; gc = GC_NEXT(gc)) { PyObject *op = FROM_GC(gc); -- cgit v1.2.1