From f9becec8cd989743aeb22d02a0ededddeecc89a6 Mon Sep 17 00:00:00 2001 From: Tim Peters Date: Sat, 9 Oct 2004 22:47:13 +0000 Subject: [PATCH] _PyGILState_Init(), PyGILState_Ensure(): Since PyThread_set_key_value() can fail, check its return value, and die if it does fail. _PyGILState_Init(): Assert that the thread doesn't already have an association for autoTLSkey. If it does, PyThread_set_key_value() will ignore the attempt to (re)set the association, which the code clearly doesn't want. --- Python/pystate.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Python/pystate.c b/Python/pystate.c index d88d2d116e8..ba9be971b8d 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -395,7 +395,9 @@ _PyGILState_Init(PyInterpreterState *i, PyThreadState *t) autoTLSkey = PyThread_create_key(); autoInterpreterState = i; /* Now stash the thread state for this thread in TLS */ - PyThread_set_key_value(autoTLSkey, (void *)t); + assert(PyThread_get_key_value(autoTLSkey) == NULL); + if (PyThread_set_key_value(autoTLSkey, (void *)t) < 0) + Py_FatalError("Couldn't create autoTLSkey mapping"); assert(t->gilstate_counter == 0); /* must be a new thread state */ t->gilstate_counter = 1; } @@ -434,7 +436,8 @@ PyGILState_Ensure(void) tcur = PyThreadState_New(autoInterpreterState); if (tcur == NULL) Py_FatalError("Couldn't create thread-state for new thread"); - PyThread_set_key_value(autoTLSkey, (void *)tcur); + if (PyThread_set_key_value(autoTLSkey, (void *)tcur) < 0) + Py_FatalError("Couldn't create autoTLSkey mapping"); current = 0; /* new thread state is never current */ } else