Changeset 101052 in vbox

Timestamp:

Sep 7, 2023 1:11:24 PM (15 months ago)

Author:

vboxsync

Message:

Main: Check if data has been initialized in platform uninit(). bugref:10384

Location:

trunk/src/VBox/Main/src-server

Files:

• PlatformARMImpl.cpp (modified) (1 diff)
• PlatformImpl.cpp (modified) (2 diffs)
• PlatformX86Impl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/PlatformARMImpl.cpp

@@ -159 +159 @@
     unconst(mMachine) = NULL;
 
-    m->bd.free();
-    unconst(m->pPeer) = NULL;
-
-    delete m;
-    m = NULL;
+    if (m)
+    {
+        m->bd.free();
+        unconst(m->pPeer) = NULL;
+
+        delete m;
+        m = NULL;
+    }
 }
 

trunk/src/VBox/Main/src-server/PlatformImpl.cpp

@@ -91 +91 @@
 
     m->bd.allocate();
+
+    /* Allocates architecture-dependent stuff. */
+    HRESULT hrc = i_initArchitecture(m->bd->architectureType);
+    AssertComRCReturnRC(hrc);
 
     /* Confirm a successful initialization */
@@ -662 +666 @@
  *          Usually only called when creating a new machine or loading settings.
  */
-HRESULT Platform::i_initArchitecture(PlatformArchitecture_T aArchitecture, Platform *aThat, bool fCopy /* = false */)
+HRESULT Platform::i_initArchitecture(PlatformArchitecture_T aArchitecture, Platform *aThat /* = NULL */, bool fCopy /* = false */)
 {
     /* sanity */

trunk/src/VBox/Main/src-server/PlatformX86Impl.cpp

@@ -168 +168 @@
     unconst(mMachine) = NULL;
 
-    m->bd.free();
-    unconst(m->pPeer) = NULL;
-
-    delete m;
-    m = NULL;
+    if (m)
+    {
+        m->bd.free();
+        unconst(m->pPeer) = NULL;
+
+        delete m;
+        m = NULL;
+    }
 }