Changeset 92115 in vbox for trunk/src

Timestamp:

Oct 27, 2021 8:21:30 PM (3 years ago)

Author:

vboxsync

Message:

Main/NLS: Must check that pszSourceTls and pszTranslationTls aren't NULL. Use the simple RTTls functions. bugref:1909

File:

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

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

@@ -37 +37 @@
 RTCRITSECTRW                VirtualBoxTranslator::s_instanceRwLock;
 VirtualBoxTranslator       *VirtualBoxTranslator::s_pInstance = NULL;
+/** TLS index that points to the translated text. */
 static RTTLS                g_idxTlsTr = NIL_RTTLS;
+/** TLS index that points to the original text. */
 static RTTLS                g_idxTlsSrc = NIL_RTTLS;
 
@@ -57 +59 @@
     , m_hStrCache(NIL_RTSTRCACHE)
 {
-    RTTlsAllocEx(&g_idxTlsTr, NULL);
-    RTTlsAllocEx(&g_idxTlsSrc, NULL);
+    g_idxTlsTr  = RTTlsAlloc();
+    g_idxTlsSrc = RTTlsAlloc();
     int rc = RTStrCacheCreate(&m_hStrCache, "API Translation");
     m_rcCache = rc;
@@ -68 +70 @@
 VirtualBoxTranslator::~VirtualBoxTranslator()
 {
-    if (g_idxTlsTr != NIL_RTTLS)
-    {
-        RTTlsFree(g_idxTlsTr);
-        g_idxTlsTr = NIL_RTTLS;
-    }
-    if (g_idxTlsSrc != NIL_RTTLS)
-    {
-        RTTlsFree(g_idxTlsSrc);
-        g_idxTlsSrc = NIL_RTTLS;
-    }
+    RTTlsFree(g_idxTlsTr);
+    g_idxTlsTr = NIL_RTTLS;
+    RTTlsFree(g_idxTlsSrc);
+    g_idxTlsSrc = NIL_RTTLS;
 
     m_pDefaultComponent = NULL;
@@ -446 +442 @@
     const char *pszSafeSource  = NULL;
     const char *pszTranslation = aComponent->pTranslator->translate(aContext, aSourceText, &pszSafeSource, aComment, aNum);
-    if (pszSafeSource)
-    {
-        if (g_idxTlsSrc != NIL_RTTLS && g_idxTlsTr != NIL_RTTLS)
-        {
-            int vrc = RTTlsSet(g_idxTlsTr, (void*)pszTranslation);
-            if (RT_SUCCESS(vrc))
-                vrc = RTTlsSet(g_idxTlsSrc, (void*)pszSafeSource);
-            if (RT_FAILURE(vrc))
-                RTTlsSet(g_idxTlsTr, NULL);
-        }
+    if (pszSafeSource && g_idxTlsSrc != NIL_RTTLS && g_idxTlsTr != NIL_RTTLS)
+    {
+        RTTlsSet(g_idxTlsTr, (void *)pszTranslation);
+        RTTlsSet(g_idxTlsSrc, (void *)pszSafeSource);
     }
 
@@ -470 +460 @@
         if (g_idxTlsSrc != NIL_RTTLS && g_idxTlsTr != NIL_RTTLS)
         {
-            const char *pszTranslationTls = NULL;
-            const char *pszSourceTls = NULL;
-            int vrc =RTTlsGetEx(g_idxTlsTr, (void**)&pszTranslationTls);
-            if (   RT_SUCCESS(vrc)
+            const char * const pszTranslationTls = (const char *)RTTlsGet(g_idxTlsTr);
+            const char * const pszSourceTls      = (const char *)RTTlsGet(g_idxTlsSrc);
+            if (   pszSourceTls      != NULL
+                && pszTranslationTls != NULL
                 && (   pszTranslationTls == aTranslation
                     || strcmp(pszTranslationTls, aTranslation) == 0))
-            {
-                vrc = RTTlsGetEx(g_idxTlsSrc, (void**)&pszSourceTls);
-                if (RT_SUCCESS(vrc))
-                    pszSource = pszSourceTls;
-            }
+                pszSource = pszSourceTls;
         }
         pCurInstance->release();