Fix memory leak in TlsRandomNumberGenerator() constructor #2660

open-telemetry · May 7, 2024 · cdffe88 · cdffe88
1 parent da8e377
commit cdffe88
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/sdk/src/common/random.cc b/sdk/src/common/random.cc
@@ -5,6 +5,7 @@
 #include "src/common/random.h"
 #include "src/common/platform/fork.h"
 
+#include <atomic>
 #include <cstring>
 #include <random>
 
@@ -26,12 +27,18 @@ class TlsRandomNumberGenerator
   TlsRandomNumberGenerator() noexcept
   {
     Seed();
-    platform::AtFork(nullptr, nullptr, OnFork);
+    if (flag)
+    {
+      platform::AtFork(nullptr, nullptr, OnFork);
+      flag = false;
+    }
   }
 
   static FastRandomNumberGenerator &engine() noexcept { return engine_; }
 
 private:
+  static std::atomic<bool> flag;
+
   static thread_local FastRandomNumberGenerator engine_;
 
   static void OnFork() noexcept { Seed(); }
@@ -44,6 +51,7 @@ class TlsRandomNumberGenerator
   }
 };
 
+std::atomic<bool> TlsRandomNumberGenerator::flag{true};
 thread_local FastRandomNumberGenerator TlsRandomNumberGenerator::engine_{};
 }  // namespace