Work around a ref leak.

python · ericsnowcurrently · Feb 13, 2024 · Dec 19, 2023 · Dec 19, 2023 · Dec 19, 2023
commit f17b29baeebf9d34ee4c56a16d55b67e161921cd
@@ -17,6 +17,8 @@
 
 static int init_exceptions(PyInterpreterState *);
 static void fini_exceptions(PyInterpreterState *);
+static int _init_not_shareable_error_type(PyInterpreterState *);
+static void _fini_not_shareable_error_type(PyInterpreterState *);
 static PyObject * _get_not_shareable_error_type(PyInterpreterState *);
 #include "crossinterp_exceptions.h"
 
@@ -1645,6 +1647,11 @@ _PyXI_Init(PyInterpreterState *interp)
     // Initialize the XID lookup state (e.g. registry).
     xid_lookup_init(interp);
 
+    // Initialize exceptions (heap types).
+    if (_init_not_shareable_error_type(interp) < 0) {
+        return _PyStatus_ERR("failed to initialize NotShareableError");
+    }
+
     return _PyStatus_OK();
 }
 
@@ -1654,6 +1661,9 @@ _PyXI_Init(PyInterpreterState *interp)
 void
 _PyXI_Fini(PyInterpreterState *interp)
 {
+    // Finalize exceptions (heap types).
+    _fini_not_shareable_error_type(interp);
+
     // Finalize the XID lookup state (e.g. registry).
     xid_lookup_fini(interp);
 }

@@ -65,17 +65,16 @@ init_exceptions(PyInterpreterState *interp)
     }
 
     // heap types
-    if (_init_not_shareable_error_type(interp) < 0) {
-        return -1;
-    }
+    // We would  call _init_not_shareable_error_type() here too,
+    // but that leads to ref leaks
 
     return 0;
 }
 
 static void
 fini_exceptions(PyInterpreterState *interp)
 {
-    _fini_not_shareable_error_type(interp);
+    // Likewise with _fini_not_shareable_error_type().
     _PyStaticType_Dealloc(interp, &_PyExc_InterpreterNotFoundError);
     _PyStaticType_Dealloc(interp, &_PyExc_InterpreterError);
 }