May 18, 2025 · May 17, 2025 · May 17, 2025 · May 17, 2025 · May 17, 2025 · May 18, 2025
diff --git a/Lib/test/test_interpreters/test_api.py b/Lib/test/test_interpreters/test_api.py
            self.assertFalse(
                self.interp_exists(interpid))

        with self.subTest('basic C-API'):
            interpid = _testinternalcapi.create_interpreter()
            self.assertTrue(
                self.interp_exists(interpid))
            _testinternalcapi.destroy_interpreter(interpid, basic=True)
            self.assertFalse(
                self.interp_exists(interpid))

    def test_get_config(self):
        # This test overlaps with
        # test.test_capi.test_misc.InterpreterConfigTests.
diff --git a/Misc/NEWS.d/next/C_API/2025-05-17-14-41-21.gh-issue-134144.xVpZik.rst b/Misc/NEWS.d/next/C_API/2025-05-17-14-41-21.gh-issue-134144.xVpZik.rst
 Fix crash when calling :c:func:`Py_EndInterpreter` with a :term:`thread state` that isn't the initial thread for the interpreter.
diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c
 static PyObject *
 destroy_interpreter(PyObject *self, PyObject *args, PyObject *kwargs)
 {
    static char *kwlist[] = {"id", NULL};
    static char *kwlist[] = {"id","basic",NULL};
    PyObject *idobj = NULL;
    int basic = 0;
    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
                                     "O:destroy_interpreter", kwlist,
                                     &idobj))
                                     "O|p:destroy_interpreter", kwlist,
                                     &idobj, &basic))
    {
        return NULL;
    }
        return NULL;
    }

    _PyXI_EndInterpreter(interp, NULL, NULL);
    if (basic)
    {
        // Test the basic Py_EndInterpreter with weird out of order thread states
        PyThreadState *t1, *t2;
        PyThreadState *prev;
        t1 = interp->threads.head;
        if (t1 == NULL) {
            t1 = PyThreadState_New(interp);
        }
        t2 = PyThreadState_New(interp);
        prev = PyThreadState_Swap(t2);
        PyThreadState_Clear(t1);
        PyThreadState_Delete(t1);
        Py_EndInterpreter(t2);
        PyThreadState_Swap(prev);
    }
    else
    {
        // use the cross interpreter _PyXI_EndInterpreter normally
        _PyXI_EndInterpreter(interp, NULL, NULL);
    }
    Py_RETURN_NONE;
 }

diff --git a/Python/pystate.c b/Python/pystate.c
 static void
 zapthreads(PyInterpreterState *interp)
 {
    PyThreadState *tstate;
    /* No need to lock the mutex here because this should only happen
       when the threads are all really dead (XXX famous last words). */
    _Py_FOR_EACH_TSTATE_UNLOCKED(interp, tstate) {
       when the threads are all really dead (XXX famous last words).

       Cannot use _Py_FOR_EACH_TSTATE_UNLOCKED because we are freeing
       the thread states here.
    */
    while ((tstate = interp->threads.head) != NULL) {
        tstate_verify_not_active(tstate);
        tstate_delete_common(tstate, 0);
        free_threadstate((_PyThreadStateImpl *)tstate);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1452,6 +1452,14 @@ def test_destroy(self):
		self.assertFalse(
		self.interp_exists(interpid))

		with self.subTest('basic C-API'):
		interpid = _testinternalcapi.create_interpreter()
		self.assertTrue(
		self.interp_exists(interpid))
		_testinternalcapi.destroy_interpreter(interpid, basic=True)
		self.assertFalse(
		self.interp_exists(interpid))

		def test_get_config(self):
		# This test overlaps with
		# test.test_capi.test_misc.InterpreterConfigTests.
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix crash when calling :c:func:`Py_EndInterpreter` with a :term:`thread state` that isn't the initial thread for the interpreter.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1690,11 +1690,12 @@ create_interpreter(PyObject self, PyObject args, PyObject *kwargs)
		static PyObject *
		destroy_interpreter(PyObject self, PyObject args, PyObject *kwargs)
		{
		static char *kwlist[] = {"id", NULL};
		static char *kwlist[] = {"id","basic",NULL};
		PyObject *idobj = NULL;
		int basic = 0;
		if (!PyArg_ParseTupleAndKeywords(args, kwargs,
		"O:destroy_interpreter", kwlist,
		&idobj))
		"O\|p:destroy_interpreter", kwlist,
		&idobj, &basic))
		{
		return NULL;
		}
Expand All		@@ -1704,7 +1705,27 @@ destroy_interpreter(PyObject self, PyObject args, PyObject *kwargs)
		return NULL;
		}

		_PyXI_EndInterpreter(interp, NULL, NULL);
		if (basic)
		{
		// Test the basic Py_EndInterpreter with weird out of order thread states
		PyThreadState t1, t2;
		PyThreadState *prev;
		t1 = interp->threads.head;
		if (t1 == NULL) {
		t1 = PyThreadState_New(interp);
		}
		t2 = PyThreadState_New(interp);
		prev = PyThreadState_Swap(t2);
		PyThreadState_Clear(t1);
		PyThreadState_Delete(t1);
		Py_EndInterpreter(t2);
		PyThreadState_Swap(prev);
		}
		else
		{
		// use the cross interpreter _PyXI_EndInterpreter normally
		_PyXI_EndInterpreter(interp, NULL, NULL);
		}
		Py_RETURN_NONE;
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1908,9 +1908,14 @@ tstate_delete_common(PyThreadState *tstate, int release_gil)
		static void
		zapthreads(PyInterpreterState *interp)
		{
		PyThreadState *tstate;
		/* No need to lock the mutex here because this should only happen
		when the threads are all really dead (XXX famous last words). */
		_Py_FOR_EACH_TSTATE_UNLOCKED(interp, tstate) {
		when the threads are all really dead (XXX famous last words).

		Cannot use _Py_FOR_EACH_TSTATE_UNLOCKED because we are freeing
		the thread states here.
		*/
		while ((tstate = interp->threads.head) != NULL) {
		tstate_verify_not_active(tstate);
		tstate_delete_common(tstate, 0);
		free_threadstate((_PyThreadStateImpl *)tstate);
Expand Down