Changeset 86501 in vbox for trunk/src/VBox/Main/include

Timestamp:

Oct 9, 2020 12:28:32 PM (5 years ago)

Author:

vboxsync

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

140816

Message:

VBoxSVC: Fix Medium leak when encoutering duplicate instances while loading a media registry (from settings) via VirtualBox::initMedia(). The media registration is now moved to before any children are loaded, so that we use the right parent for them. This essentially changes the operation to a merge. An unaddressed issue is that on child load failure, we will leave the parent(s) still registered but non-functioning (uninit was done). (The old code would just leave any successfully loaded children registered with non-working parents only accessible via their parent attribute.) bugref:9841

Location:

trunk/src/VBox/Main/include

Files:

• MediumImpl.h (modified) (2 diffs)
• VirtualBoxImpl.h (modified) (1 diff)

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

@@ -79 +79 @@
                     const settings::Medium &data,
                     const Utf8Str &strMachineFolder);
-    HRESULT init(VirtualBox *aVirtualBox,
-                 Medium *aParent,
-                 DeviceType_T aDeviceType,
-                 const Guid &uuidMachineRegistry,
-                 const settings::Medium &data,
-                 const Utf8Str &strMachineFolder,
-                 AutoWriteLock &mediaTreeLock);
+    HRESULT initFromSettings(VirtualBox *aVirtualBox,
+                             Medium *aParent,
+                             DeviceType_T aDeviceType,
+                             const Guid &uuidMachineRegistry,
+                             const settings::Medium &data,
+                             const Utf8Str &strMachineFolder,
+                             AutoWriteLock &mediaTreeLock,
+                             ComObjPtr<Medium> *ppRegistered);
 
     // initializer for host floppy/DVD
@@ -119 +120 @@
     /* handles caller/locking itself */
     bool i_addRegistry(const Guid &id);
+    bool i_addRegistryNoCallerCheck(const Guid &id);
     /* handles caller/locking itself, caller is responsible for tree lock */
     bool i_addRegistryRecursive(const Guid &id);

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

@@ -277 +277 @@
     void i_copyPathRelativeToConfig(const Utf8Str &strSource, Utf8Str &strTarget);
     HRESULT i_registerMedium(const ComObjPtr<Medium> &pMedium, ComObjPtr<Medium> *ppMedium,
-                             AutoWriteLock &mediaTreeLock);
+                             AutoWriteLock &mediaTreeLock, bool fCalledFromMediumInit = false);
     HRESULT i_unregisterMedium(Medium *pMedium);
     void i_pushMediumToListWithChildren(MediaList &llMedia, Medium *pMedium);