Intermediate changes

1 files changed, 10 insertions, 1 deletions

diff --git a/contrib/libs/clang16-rt/lib/lsan/lsan_thread.cpp b/contrib/libs/clang16-rt/lib/lsan/lsan_thread.cpp
index 137c7e4e4f..bf7fcd833d 100644
--- a/contrib/libs/clang16-rt/lib/lsan/lsan_thread.cpp
+++ b/contrib/libs/clang16-rt/lib/lsan/lsan_thread.cpp
@@ -59,12 +59,21 @@ void ThreadFinish() {
   SetCurrentThread(kInvalidTid);
 }
 
+struct ThreadsGuard {
+  ThreadsGuard() {
+    LockThreadRegistry();
+  }
+  ~ThreadsGuard() {
+    UnlockThreadRegistry();
+  }
+};
+
 ThreadContext *CurrentThreadContext() {
   if (!thread_registry)
     return nullptr;
   if (GetCurrentThread() == kInvalidTid)
     return nullptr;
-  // No lock needed when getting current thread.
+  ThreadsGuard lock;
   return (ThreadContext *)thread_registry->GetThreadLocked(GetCurrentThread());
 }