Changeset 92039 in vbox for trunk

Timestamp:

Oct 25, 2021 2:27:59 PM (3 years ago)

Author:

vboxsync

Message:

Main: bugref:1909: Fixed memory leak in the translation engine

File:

• trunk/src/VBox/Main/src-all/VirtualBoxTranslator.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-all/VirtualBoxTranslator.cpp

@@ -37 +37 @@
 RTCRITSECTRW                VirtualBoxTranslator::s_instanceRwLock;
 VirtualBoxTranslator       *VirtualBoxTranslator::s_pInstance = NULL;
+static RTONCE               g_tlsOnce = RTONCE_INITIALIZER;
 static RTTLS                g_idxTls = NIL_RTTLS;
 
@@ -61 +62 @@
         delete pCache;
     }
+}
+
+
+/**
+ * @callback_method_impl{FNRTONCECLEANUP, Destroys TLS index during the process termination.}
+ */
+DECLCALLBACK(void) uninitTls(void *pvUser, bool fLazyCleanUpOk)
+{
+    RT_NOREF(pvUser);
+    if (fLazyCleanUpOk && g_idxTls != NIL_RTTLS)
+    {
+        RTTlsFree(g_idxTls);
+        g_idxTls = NIL_RTTLS;
+    }
+}
+
+
+/**
+ * @callback_method_impl{FNRTONCE}
+ */
+static DECLCALLBACK(int32_t) initTls(void *pvUser)
+{
+    RT_NOREF(pvUser);
+    RTTlsAllocEx(&g_idxTls, &freeThreadCache);
+    return VINF_SUCCESS;
 }
 
@@ -71 +97 @@
     , m_hStrCache(NIL_RTSTRCACHE)
 {
-    RTTlsAllocEx(&g_idxTls, &freeThreadCache);
     int rc = RTStrCacheCreate(&m_hStrCache, "API Translation");
     m_rcCache = rc;
@@ -90 +115 @@
             RTTlsSet(g_idxTls, NULL);
         }
-        RTTlsFree(g_idxTls);
-        g_idxTls = NIL_RTTLS;
     }
 
@@ -446 +469 @@
 static LastTranslation *getTlsEntry() RT_NOEXCEPT
 {
-    if (RT_LIKELY(g_idxTls != NIL_RTTLS))
+    int rc = RTOnceEx(&g_tlsOnce, initTls, uninitTls, NULL);
+    if (RT_SUCCESS(rc) && RT_LIKELY(g_idxTls != NIL_RTTLS))
     {
         LastTranslation *pEntry = (LastTranslation *)RTTlsGet(g_idxTls);
@@ -457 +481 @@
             pEntry = new LastTranslation();
             pEntry->first = pEntry->second = "";
-            int rc = RTTlsSet(g_idxTls, pEntry);
+            rc = RTTlsSet(g_idxTls, pEntry);
             if (RT_SUCCESS(rc))
                 return pEntry;