Changeset 31328 in vbox for trunk/src/VBox

Timestamp:

Aug 3, 2010 10:45:28 AM (15 years ago)

Author:

vboxsync

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

64366

Message:

Main: crash fix for r64335 (which broke storage controllers and create machine)

File:

• trunk/src/VBox/Main/StorageControllerImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/StorageControllerImpl.cpp

@@ -79 +79 @@
 struct StorageController::Data
 {
-    Data()
+    Data(Machine * const aMachine)
         : pVirtualBox(NULL),
           pSystemProperties(NULL),
-          pParent(NULL)
-    { }
+          pParent(aMachine)
+    {
+        unconst(pVirtualBox) = aMachine->getVirtualBox();
+        unconst(pSystemProperties) = pVirtualBox->getSystemProperties();
+    }
 
     VirtualBox * const                  pVirtualBox;
@@ -136 +139 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    m = new Data();
-
-    unconst(m->pVirtualBox) = aParent->getVirtualBox();
-    unconst(m->pSystemProperties) = m->pVirtualBox->getSystemProperties();
-
-    unconst(m->pParent) = aParent;
+    m = new Data(aParent);
+
     /* m->pPeer is left null */
 
@@ -219 +218 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    m = new Data();
-
-    unconst(m->pParent) = aParent;
+    m = new Data(aParent);
 
     /* register with parent early, since uninit() will unconditionally
@@ -228 +225 @@
 
     /* sanity */
-    AutoCaller thatCaller (aThat);
+    AutoCaller thatCaller(aThat);
     AssertComRCReturnRC(thatCaller.rc());
 
@@ -267 +264 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    m = new Data();
-
-    unconst(m->pParent) = aParent;
+    m = new Data(aParent);
     /* m->pPeer is left null */