Changeset 91322 in vbox

Timestamp:

Sep 21, 2021 4:07:15 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

146983

Message:

Main: bugref:1909: Fixed SEGFAULT when extpack plugin is not loaded but NLS is enabled

File:

• trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp (modified) (3 diffs)

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

@@ -567 +567 @@
      */
     if (!m->fUsable)
-        hrc = setError(E_FAIL, tr("%s"), m->strWhyUnusable.c_str());
+        hrc = setError(E_FAIL, "%s", m->strWhyUnusable.c_str());
     else
     {
@@ -650 +650 @@
             }
             else
-                hrc = setError(VBOX_E_OBJECT_NOT_FOUND, tr("%s"), szError);
+                hrc = setError(VBOX_E_OBJECT_NOT_FOUND, "%s", szError);
         }
         else
@@ -818 +818 @@
 #ifdef VBOX_WITH_MAIN_NLS
     /* register language files if exist */
-    if (m->pReg->pszNlsBaseName != NULL)
+    if (m->pReg != NULL && m->pReg->pszNlsBaseName != NULL)
     {
         char szPath[RTPATH_MAX];