about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRaoul Strackx <raoul.strackx@fortanix.com>2022-10-13 18:58:25 +0200
committerRaoul Strackx <raoul.strackx@fortanix.com>2022-10-14 17:07:18 +0200
commitc46185bea01190e54ffc672d5b2b13c8df5d8068 (patch)
tree63e76c135bf2a3fd44522d07299fc55855eb468a
parent4891d57f7aab37b5d6a84f2901c0bb8903111d53 (diff)
downloadrust-c46185bea01190e54ffc672d5b2b13c8df5d8068.tar.gz
rust-c46185bea01190e54ffc672d5b2b13c8df5d8068.zip
Bugfix: keep TLS data in sync
-rw-r--r--library/std/src/sys/sgx/abi/tls/mod.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/library/std/src/sys/sgx/abi/tls/mod.rs b/library/std/src/sys/sgx/abi/tls/mod.rs
index 13d96e9a633..09c4ab3d3e9 100644
--- a/library/std/src/sys/sgx/abi/tls/mod.rs
+++ b/library/std/src/sys/sgx/abi/tls/mod.rs
@@ -111,6 +111,7 @@ impl Tls {
             rtabort!("TLS limit exceeded")
         };
         TLS_DESTRUCTOR[index].store(dtor.map_or(0, |f| f as usize), Ordering::Relaxed);
+        unsafe { Self::current() }.data[index].set(ptr::null_mut());
         Key::from_index(index)
     }