Changeset 68255 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Aug 2, 2017 3:56:18 PM (8 years ago)

Author:

vboxsync

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

117367

Message:

DBGFR3InfoDeregisterDevice,DBGFR3InfoDeregisterDevice: Better fix for freeing the first list item.

File:

• trunk/src/VBox/VMM/VMMR3/DBGFInfo.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/DBGFInfo.cpp

@@ -501 +501 @@
          * Free all owned by the device.
          */
-        for (; pInfo; pPrev = pInfo, pInfo = pInfo->pNext)
+        while (pInfo != NULL)
             if (    pInfo->enmType == DBGFINFOTYPE_DEV
                 &&  pInfo->u.Dev.pDevIns == pDevIns)
             {
+                PDBGFINFO volatile pFree = pInfo;
                 if (pPrev)
-                    pPrev->pNext = pInfo->pNext;
+                    pInfo = pPrev->pNext = pInfo->pNext;
                 else
-                    pUVM->dbgf.s.pInfoFirst = pInfo->pNext;
-                MMR3HeapFree(pInfo);
-                pInfo = pPrev;
-                if (!pInfo)
-                    break;
+                    pInfo = pUVM->dbgf.s.pInfoFirst = pInfo->pNext;
+                MMR3HeapFree(pFree);
+            }
+            else
+            {
+                pPrev = pInfo;
+                pInfo = pInfo->pNext;
             }
         rc = VINF_SUCCESS;
@@ -575 +578 @@
          * Free all owned by the driver.
          */
-        for (; pInfo; pPrev = pInfo, pInfo = pInfo->pNext)
+        while (pInfo != NULL)
             if (    pInfo->enmType == DBGFINFOTYPE_DRV
                 &&  pInfo->u.Drv.pDrvIns == pDrvIns)
             {
+                PDBGFINFO volatile pFree = pInfo;
                 if (pPrev)
-                    pPrev->pNext = pInfo->pNext;
+                    pInfo = pPrev->pNext = pInfo->pNext;
                 else
-                    pUVM->dbgf.s.pInfoFirst = pInfo->pNext;
-                MMR3HeapFree(pInfo);
-                pInfo = pPrev;
+                    pInfo = pUVM->dbgf.s.pInfoFirst = pInfo->pNext;
+                MMR3HeapFree(pFree);
+            }
+            else
+            {
+                pPrev = pInfo;
+                pInfo = pInfo->pNext;
             }
         rc = VINF_SUCCESS;