Clear __eh_globals_init's _S_init in the dtor before deleting the
gthread key.
This ensures that, in case any code involved in deleting the key
interacts with eh_globals, the key that is being deleted won't be
used, and the non-thread-specific eh_globals fallback will.
for libstdc++-v3/ChangeLog
* libsupc++/eh_globals.cc [!_GLIBCXX_HAVE_TLS]
(__eh_globals_init::~__eh_globals_init): Clear _S_init first.
~__eh_globals_init()
{
if (_S_init)
- __gthread_key_delete(_M_key);
- _S_init = false;
+ {
+ /* Set it before the call, so that, should
+ __gthread_key_delete throw an exception, it won't rely on
+ the key being deleted. */
+ _S_init = false;
+ __gthread_key_delete(_M_key);
+ }
}
__eh_globals_init(const __eh_globals_init&) = delete;