Skip to content

Commit

Permalink
GH-99205: Mark new interpreters and threads as non-static (GH-99268)
Browse files Browse the repository at this point in the history
  • Loading branch information
brandtbucher committed Nov 9, 2022
1 parent 58ee5d8 commit 283ab0e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix an issue that prevented :c:type:`PyThreadState` and
:c:type:`PyInterpreterState` memory from being freed properly.
8 changes: 8 additions & 0 deletions Python/pystate.c
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,7 @@ PyInterpreterState_New(void)
interp = &runtime->_main_interpreter;
assert(interp->id == 0);
assert(interp->next == NULL);
assert(interp->_static);

interpreters->main = interp;
}
Expand All @@ -370,6 +371,9 @@ PyInterpreterState_New(void)
// Set to _PyInterpreterState_INIT.
memcpy(interp, &initial._main_interpreter,
sizeof(*interp));
// We need to adjust any fields that are different from the initial
// interpreter (as defined in _PyInterpreterState_INIT):
interp->_static = false;

if (id < 0) {
/* overflow or Py_Initialize() not called yet! */
Expand Down Expand Up @@ -837,6 +841,7 @@ new_threadstate(PyInterpreterState *interp)
assert(id == 1);
used_newtstate = 0;
tstate = &interp->_initial_thread;
assert(tstate->_static);
}
else {
// Every valid interpreter must have at least one thread.
Expand All @@ -848,6 +853,9 @@ new_threadstate(PyInterpreterState *interp)
memcpy(tstate,
&initial._main_interpreter._initial_thread,
sizeof(*tstate));
// We need to adjust any fields that are different from the initial
// thread (as defined in _PyThreadState_INIT):
tstate->_static = false;
}
interp->threads.head = tstate;

Expand Down

0 comments on commit 283ab0e

Please sign in to comment.