diff options
| author | Alexandre Oliva <oliva@adacore.com> | 2022-06-21 23:11:02 -0300 |
|---|---|---|
| committer | Alexandre Oliva <oliva@gnu.org> | 2022-06-21 23:11:02 -0300 |
| commit | a33dda016e5acf9c6325ce8a72a1b0238130374e (patch) | |
| tree | 349030e6295e9ff0f8c7aa6558add14ceb816073 | |
| parent | f129628e8f261b66a34a9626e1f5b0293548a6a8 (diff) | |
| download | gcc-a33dda016e5acf9c6325ce8a72a1b0238130374e.zip gcc-a33dda016e5acf9c6325ce8a72a1b0238130374e.tar.gz gcc-a33dda016e5acf9c6325ce8a72a1b0238130374e.tar.bz2 | |
libstdc++: eh_globals: gthreads: reset _S_init before deleting key
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.
| -rw-r--r-- | libstdc++-v3/libsupc++/eh_globals.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/libsupc++/eh_globals.cc b/libstdc++-v3/libsupc++/eh_globals.cc index 768425c..0aadb69 100644 --- a/libstdc++-v3/libsupc++/eh_globals.cc +++ b/libstdc++-v3/libsupc++/eh_globals.cc @@ -119,8 +119,13 @@ struct __eh_globals_init ~__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; |