Changeset 91392 in vbox

Timestamp:

Sep 27, 2021 12:33:40 PM (3 years ago)

Author:

vboxsync

Message:

Main/NLS: VirtualBoxTranslator::i_translate should not safe the passed in source string as there is no guarantee that it is immutable. So, make the translator return a safe source string copy iff it returns a translated string. bugref:1909

Location:

trunk/src/VBox/Main

Files:

• include/QMTranslator.h (modified) (1 diff)
• src-all/QMTranslatorImpl.cpp (modified) (4 diffs)
• src-all/VirtualBoxTranslator.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/QMTranslator.h

@@ -33 +33 @@
      * Gets translation from loaded QM file
      *
-     * @param   pszContext  QM context to look for translation
-     * @param   pszSource   Source string in one-byte encoding
-     * @param   pszDisamb   Disambiguationg comment, empty by default
-     * @param   iNum        Plural form indicator.
+     * @param   pszContext      QM context to look for translation
+     * @param   pszSource       Source string in one-byte encoding
+     * @param   ppszSafeSource  Where to return pointer to a safe copy of @a
+     *                          pszSource for the purpose of reverse translation.
+     *                          Will be set to NULL if @a pszSource is returned.
+     * @param   pszDisamb       Disambiguationg comment, empty by default
+     * @param   iNum            Plural form indicator.
      *
      * @returns Pointer to a translation (UTF-8 encoding), source string on failure.
      */
-    const char *translate(const char *pszContext, const char *pszSource,
+    const char *translate(const char *pszContext, const char *pszSource, const char **ppszSafeSource,
                           const char *pszDisamb = NULL, const int iNum = -1) const RT_NOEXCEPT;
 

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

@@ -414 +414 @@
                           const char *pszSource,
                           const char *pszDisamb,
-                          const int   aNum) const
+                          const int   aNum,
+                          const char **ppszSafeSource) const
     {
         QMHashSetConstIter lowerIter, upperIter;
@@ -442 +443 @@
                     && (!apszDisabm[i]  || !*apszDisabm[i]  || RTStrCmp(message.pszComment, apszDisabm[i]) == 0 ))
                 {
+                    *ppszSafeSource = message.pszSource;
                     const std::vector<const char *> &vecTranslations = m_messageArray[iter->offset].vecTranslations;
                     size_t const idxPlural = plural(aNum);
@@ -449 +451 @@
         }
 
+        *ppszSafeSource = NULL;
         return pszSource;
     }
@@ -608 +611 @@
 QMTranslator::~QMTranslator() { delete m_impl; }
 
-const char *QMTranslator::translate(const char *pszContext, const char *pszSource,
-                                    const char *pszDisamb, const int aNum) const RT_NOEXCEPT
+const char *QMTranslator::translate(const char *pszContext, const char *pszSource, const char **ppszSafeSource,
+                                    const char *pszDisamb /*== NULL*/, const int aNum /*= -1*/) const RT_NOEXCEPT
+
 {
-    return m_impl->translate(pszContext, pszSource, pszDisamb, aNum);
+    return m_impl->translate(pszContext, pszSource, pszDisamb, aNum, ppszSafeSource);
 }
 

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

@@ -437 +437 @@
     if (pCurrInstance != NULL)
     {
-        pszTranslation = pCurrInstance->i_translate(aComponent, aContext,
-                                                    aSourceText, aComment, aNum);
+        pszTranslation = pCurrInstance->i_translate(aComponent, aContext, aSourceText, aComment, aNum);
         pCurrInstance->release();
     }
@@ -486 +485 @@
         return aSourceText;
 
-    const char *pszTranslation = aComponent->pTranslator->translate(aContext, aSourceText, aComment, aNum);
-
-    LastTranslation *pEntry = getTlsEntry();
-    if (pEntry)
-    {
-        pEntry->first = pszTranslation;
-        /** @todo r=bird: This is not technically threadsafe.  Move this down to the
-         *        above translator call. */
-        pEntry->second = m_hStrCache != NIL_RTSTRCACHE ? RTStrCacheEnter(m_hStrCache, aSourceText) : aSourceText;
+    const char *pszSafeSource  = NULL;
+    const char *pszTranslation = aComponent->pTranslator->translate(aContext, aSourceText, &pszSafeSource, aComment, aNum);
+    if (pszSafeSource)
+    {
+        LastTranslation *pEntry = getTlsEntry();
+        if (pEntry)
+        {
+            pEntry->first = pszTranslation;
+            pEntry->second = pszSafeSource;
+        }
     }