Changeset 92144 in vbox for trunk/src

Timestamp:

Oct 29, 2021 12:58:11 PM (3 years ago)

Author:

vboxsync

Message:

Main/VirtualBoxClient: take some more care when processing the VBoxEventType_OnLanguageChanged callback as we might be racing com::Shutdown and having the ground open up beneath our feet at any time. Logging. bugref:1909

File:

• trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp

@@ -40 +40 @@
 #endif
 
+#include <new>
+
 
 /** Waiting time between probing whether VBoxSVC is alive. */
@@ -84 +86 @@
             case VBoxEventType_OnLanguageChanged:
             {
+                /*
+                 * Proceed with uttmost care as we might be racing com::Shutdown()
+                 * and have the ground open up beneath us.
+                 */
+                LogFunc(("VBoxEventType_OnLanguageChanged\n"));
                 VirtualBoxTranslator *pTranslator = VirtualBoxTranslator::tryInstance();
                 if (pTranslator)
                 {
                     ComPtr<ILanguageChangedEvent> pEvent = aEvent;
-                    HRESULT rc = E_FAIL;
                     Assert(pEvent);
 
+                    /* This call may fail if we're racing COM shutdown. */
                     com::Bstr bstrLanguageId;
-                    rc = pEvent->COMGETTER(LanguageId)(bstrLanguageId.asOutParam());
-                    AssertComRC(rc);
-
-                    com::Utf8Str strLanguageId(bstrLanguageId);
-                    pTranslator->i_loadLanguage(strLanguageId.c_str());
+                    HRESULT hrc = pEvent->COMGETTER(LanguageId)(bstrLanguageId.asOutParam());
+                    if (SUCCEEDED(hrc))
+                    {
+                        try
+                        {
+                            com::Utf8Str strLanguageId(bstrLanguageId);
+                            LogFunc(("New language ID: %s\n", strLanguageId.c_str()));
+                            pTranslator->i_loadLanguage(strLanguageId.c_str());
+                        }
+                        catch (std::bad_alloc &)
+                        {
+                            LogFunc(("Caught bad_alloc"));
+                        }
+                    }
+                    else
+                        LogFunc(("Failed to get new language ID: %Rhrc\n", hrc));
+
                     pTranslator->release();
                 }
@@ -560 +579 @@
     AutoUninitSpan autoUninitSpan(this);
     if (autoUninitSpan.uninitDone())
+    {
+        LogFlowThisFunc(("already done\n"));
         return;
+    }
 
 #ifdef VBOX_WITH_MAIN_NLS
@@ -589 +611 @@
 
     ASMAtomicDecU32(&g_cInstances);
+
+    LogFlowThisFunc(("returns\n"));
 }