Changeset 86509 in vbox for trunk/src

Timestamp:

Oct 9, 2020 5:37:05 PM (4 years ago)

Author:

vboxsync

Message:

VBoxSVC/Appliance: Fixed IMachine reference leak in Appliance::i_searchUniqueVMName(). bugref:9841

Location:

trunk/src/VBox/Main

Files:

• include/ApplianceImpl.h (modified) (2 diffs)
• src-server/ApplianceImpl.cpp (modified) (1 diff)
• src-server/ApplianceImplImport.cpp (modified) (5 diffs)

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

@@ -131 +131 @@
      */
     bool i_isApplianceIdle();
-    HRESULT i_searchUniqueVMName(Utf8Str& aName) const;
+    HRESULT i_searchUniqueVMName(Utf8Str &aName) const;
     HRESULT i_ensureUniqueImageFilePath(const Utf8Str &aMachineFolder,
                                         DeviceType_T aDeviceType,
@@ -211 +211 @@
     void i_importMachineGeneric(const ovf::VirtualSystem &vsysThis,
                                 ComObjPtr<VirtualSystemDescription> &vsdescThis,
-                                ComPtr<IMachine> &pNewMachine,
+                                ComPtr<IMachine> &pNewMachineRet,
                                 ImportStack &stack);
     void i_importVBoxMachine(ComObjPtr<VirtualSystemDescription> &vsdescThis,

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

@@ -966 +966 @@
 }
 
-HRESULT Appliance::i_searchUniqueVMName(Utf8Str& aName) const
-{
-    IMachine *machine = NULL;
+HRESULT Appliance::i_searchUniqueVMName(Utf8Str &aName) const
+{
+    ComPtr<IMachine> ptrMachine;
     char *tmpName = RTStrDup(aName.c_str());
     int i = 1;
-    while (mVirtualBox->FindMachine(Bstr(tmpName).raw(), &machine) != VBOX_E_OBJECT_NOT_FOUND)
+    while (mVirtualBox->FindMachine(Bstr(tmpName).raw(), ptrMachine.asOutParam()) != VBOX_E_OBJECT_NOT_FOUND)
     {
         RTStrFree(tmpName);

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

@@ -4316 +4316 @@
  * about what needs cleaning up (to support rollback).
  *
- * @param vsysThis OVF virtual system (machine) to import.
- * @param vsdescThis  Matching virtual system description (machine) to import.
- * @param pNewMachine out: Newly created machine.
- * @param stack Cleanup stack for when this throws.
+ * @param       vsysThis        OVF virtual system (machine) to import.
+ * @param       vsdescThis      Matching virtual system description (machine) to import.
+ * @param[out]  pNewMachineRet  Newly created machine.
+ * @param       stack           Cleanup stack for when this throws.
+ *
+ * @throws HRESULT
  */
 void Appliance::i_importMachineGeneric(const ovf::VirtualSystem &vsysThis,
                                        ComObjPtr<VirtualSystemDescription> &vsdescThis,
-                                       ComPtr<IMachine> &pNewMachine,
+                                       ComPtr<IMachine> &pNewMachineRet,
                                        ImportStack &stack)
 {
@@ -4339 +4341 @@
     if (!stack.strPrimaryGroup.isEmpty() && stack.strPrimaryGroup != "/")
         Bstr(stack.strPrimaryGroup).detachTo(groups.appendedRaw());
+    ComPtr<IMachine> pNewMachine;
     rc = mVirtualBox->CreateMachine(Bstr(stack.strSettingsFilename).raw(),
                                     Bstr(stack.strNameVBox).raw(),
@@ -4346 +4349 @@
                                     pNewMachine.asOutParam());
     if (FAILED(rc)) throw rc;
+    pNewMachineRet = pNewMachine;
 
     // set the description
@@ -5619 +5623 @@
         ComObjPtr<VirtualSystemDescription> vsdescThis = (*it1);
 
-        ComPtr<IMachine> pNewMachine;
-
         // there are two ways in which we can create a vbox machine from OVF:
         // -- either this OVF was written by vbox 3.2 or later, in which case there is a <vbox:Machine> element
@@ -5737 +5739 @@
 
         // import vbox:machine or OVF now
+        ComPtr<IMachine> pNewMachine; /** @todo pointless */
         if (vsdescThis->m->pConfig)
             // vbox:Machine config