Changeset 86506 in vbox

Timestamp:

Oct 9, 2020 3:54:19 PM (4 years ago)

Author:

vboxsync

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

140821

Message:

Main/VBoxC: Fix Medium::parent reference leaks in Console::i_configMedium(). bugref:9841

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (1 diff)
• src-client/ConsoleImpl2.cpp (modified) (15 diffs)

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

@@ -735 +735 @@
                        bool fDiscard,
                        bool fNonRotational,
-                       IMedium *pMedium,
+                       ComPtr<IMedium> ptrMedium,
                        MachineState_T aMachineState,
                        HRESULT *phrc);

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

@@ -4515 +4515 @@
         mapMediumAttachments[devicePath] = pMediumAtt;
 
-        ComPtr<IMedium> pMedium;
-        hrc = pMediumAtt->COMGETTER(Medium)(pMedium.asOutParam());                          H();
+        ComPtr<IMedium> ptrMedium;
+        hrc = pMediumAtt->COMGETTER(Medium)(ptrMedium.asOutParam());                        H();
 
         /*
@@ -4527 +4527 @@
                 || aMachineState == MachineState_Restoring))
         {
-            rc = i_checkMediumLocation(pMedium, &fUseHostIOCache);
+            rc = i_checkMediumLocation(ptrMedium, &fUseHostIOCache);
             if (RT_FAILURE(rc))
                 return rc;
@@ -4533 +4533 @@
 
         BOOL fPassthrough = FALSE;
-        if (pMedium)
+        if (ptrMedium.isNotNull())
         {
             BOOL fHostDrive;
-            hrc = pMedium->COMGETTER(HostDrive)(&fHostDrive);                               H();
+            hrc = ptrMedium->COMGETTER(HostDrive)(&fHostDrive);                             H();
             if (  (   lType == DeviceType_DVD
                    || lType == DeviceType_Floppy)
@@ -4545 +4545 @@
                  */
                 Bstr strFile;
-                hrc = pMedium->COMGETTER(Location)(strFile.asOutParam());                   H();
+                hrc = ptrMedium->COMGETTER(Location)(strFile.asOutParam());                 H();
                 Utf8Str utfFile = Utf8Str(strFile);
                 RTFSTYPE enmFsTypeFile = RTFSTYPE_UNKNOWN;
@@ -4593 +4593 @@
                             !!fDiscard,
                             !!fNonRotational,
-                            pMedium,
+                            ptrMedium,
                             aMachineState,
                             phrc);
@@ -4679 +4679 @@
                             bool fDiscard,
                             bool fNonRotational,
-                            IMedium *pMedium,
+                            ComPtr<IMedium> ptrMedium,
                             MachineState_T aMachineState,
                             HRESULT *phrc)
@@ -4695 +4695 @@
 
         BOOL fHostDrive = FALSE;
-        MediumType_T mediumType  = MediumType_Normal;
-        if (pMedium)
-        {
-            hrc = pMedium->COMGETTER(HostDrive)(&fHostDrive);                               H();
-            hrc = pMedium->COMGETTER(Type)(&mediumType);                                    H();
+        MediumType_T mediumType = MediumType_Normal;
+        if (ptrMedium.isNotNull())
+        {
+            hrc = ptrMedium->COMGETTER(HostDrive)(&fHostDrive);                             H();
+            hrc = ptrMedium->COMGETTER(Type)(&mediumType);                                  H();
         }
 
         if (fHostDrive)
         {
-            Assert(pMedium);
+            Assert(ptrMedium.isNotNull());
             if (enmType == DeviceType_DVD)
             {
@@ -4710 +4710 @@
                 InsertConfigNode(pLunL0, "Config", &pCfg);
 
-                hrc = pMedium->COMGETTER(Location)(bstr.asOutParam());                      H();
+                hrc = ptrMedium->COMGETTER(Location)(bstr.asOutParam());                    H();
                 InsertConfigString(pCfg, "Path", bstr);
 
@@ -4720 +4720 @@
                 InsertConfigNode(pLunL0, "Config", &pCfg);
 
-                hrc = pMedium->COMGETTER(Location)(bstr.asOutParam());                      H();
+                hrc = ptrMedium->COMGETTER(Location)(bstr.asOutParam());                    H();
                 InsertConfigString(pCfg, "Path", bstr);
             }
@@ -4755 +4755 @@
             }
 
-            if (    pMedium
+            if (    ptrMedium.isNotNull()
                 && (   enmType == DeviceType_DVD
                     || enmType == DeviceType_Floppy)
@@ -4767 +4767 @@
                 // would be to discard the VM state...
                 MediumState_T mediumState;
-                hrc = pMedium->RefreshState(&mediumState);                                  H();
+                hrc = ptrMedium->RefreshState(&mediumState);                                H();
                 if (mediumState == MediumState_Inaccessible)
                 {
                     Bstr loc;
-                    hrc = pMedium->COMGETTER(Location)(loc.asOutParam());                   H();
+                    hrc = ptrMedium->COMGETTER(Location)(loc.asOutParam());                 H();
                     i_atVMRuntimeErrorCallbackF(0, "DvdOrFloppyImageInaccessible",
                                                 "The image file '%ls' is inaccessible and is being ignored. "
@@ -4777 +4777 @@
                                                 loc.raw(),
                                                 enmType == DeviceType_DVD ? "DVD" : "floppy");
-                    pMedium = NULL;
-                }
-            }
-
-            if (pMedium)
+                    ptrMedium.setNull();
+                }
+            }
+
+            if (ptrMedium.isNotNull())
             {
                 /* Start with length of parent chain, as the list is reversed */
                 unsigned uImage = 0;
-                IMedium *pTmp = pMedium;
-                while (pTmp)
+                ComPtr<IMedium> ptrTmp = ptrMedium;
+                while (ptrTmp.isNotNull())
                 {
                     uImage++;
-                    hrc = pTmp->COMGETTER(Parent)(&pTmp);                                   H();
+                    ComPtr<IMedium> ptrParent;
+                    hrc = ptrTmp->COMGETTER(Parent)(ptrParent.asOutParam());               H();
+                    ptrTmp = ptrParent;
                 }
                 /* Index of last image */
@@ -4813 +4815 @@
 # endif
 
-                hrc = pMedium->COMGETTER(Location)(bstr.asOutParam());                      H();
+                hrc = ptrMedium->COMGETTER(Location)(bstr.asOutParam());                    H();
                 InsertConfigString(pCfg, "Path", bstr);
 
-                hrc = pMedium->COMGETTER(Format)(bstr.asOutParam());                        H();
+                hrc = ptrMedium->COMGETTER(Format)(bstr.asOutParam());                      H();
                 InsertConfigString(pCfg, "Format", bstr);
 
@@ -4877 +4879 @@
                 bool fHostIP = true;
                 bool fEncrypted = false;
-                hrc = i_configMediumProperties(pCfg, pMedium, &fHostIP, &fEncrypted); H();
+                hrc = i_configMediumProperties(pCfg, ptrMedium, &fHostIP, &fEncrypted); H();
 
                 /* Create an inverted list of parents. */
                 uImage--;
-                IMedium *pParentMedium = pMedium;
+                ComPtr<IMedium> ptrParentMedium = ptrMedium;
                 for (PCFGMNODE pParent = pCfg;; uImage--)
                 {
-                    hrc = pParentMedium->COMGETTER(Parent)(&pMedium);                       H();
-                    if (!pMedium)
+                    ComPtr<IMedium> ptrCurMedium;
+                    hrc = ptrParentMedium->COMGETTER(Parent)(ptrCurMedium.asOutParam());    H();
+                    if (ptrCurMedium.isNull())
                         break;
 
                     PCFGMNODE pCur;
                     InsertConfigNode(pParent, "Parent", &pCur);
-                    hrc = pMedium->COMGETTER(Location)(bstr.asOutParam());                  H();
+                    hrc = ptrCurMedium->COMGETTER(Location)(bstr.asOutParam()); H();
                     InsertConfigString(pCur, "Path", bstr);
 
-                    hrc = pMedium->COMGETTER(Format)(bstr.asOutParam());                    H();
+                    hrc = ptrCurMedium->COMGETTER(Format)(bstr.asOutParam());  H();
                     InsertConfigString(pCur, "Format", bstr);
 
@@ -4905 +4908 @@
 
                     /* Configure medium properties. */
-                    hrc = i_configMediumProperties(pCur, pMedium, &fHostIP, &fEncrypted); H();
+                    hrc = i_configMediumProperties(pCur, ptrCurMedium, &fHostIP, &fEncrypted); H();
 
                     /* next */
                     pParent = pCur;
-                    pParentMedium = pMedium;
+                    ptrParentMedium = ptrCurMedium;
                 }