Changeset 65708 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 9, 2017 4:53:09 PM (8 years ago)

Author:

vboxsync

Message:

Devices/Bus: fixed small memory leaks on destruct

Location:

trunk/src/VBox/Devices/Bus

Files:

• DevPCI.cpp (modified) (4 diffs)
• DevPciIch9.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Bus/DevPCI.cpp

@@ -1389 +1389 @@
 
 /**
+ * @interface_method_impl{PDMDEVREG,pfnDestruct}
+ */
+static DECLCALLBACK(int)   pciR3Destruct(PPDMDEVINS pDevIns)
+{
+    PDEVPCIROOT pGlobals = PDMINS_2_DATA(pDevIns, PDEVPCIROOT);
+    if (pGlobals->PciBus.papBridgesR3)
+    {
+        PDMDevHlpMMHeapFree(pDevIns, pGlobals->PciBus.papBridgesR3);
+        pGlobals->PciBus.papBridgesR3 = NULL;
+    }
+    return VINF_SUCCESS;
+}
+
+
+/**
  * The device registration structure.
  */
@@ -1414 +1429 @@
     pciR3Construct,
     /* pfnDestruct */
-    NULL,
+    pciR3Destruct,
     /* pfnRelocate */
     devpciR3RootRelocate,
@@ -1704 +1719 @@
 
 /**
+ * @interface_method_impl{PDMDEVREG,pfnDestruct}
+ */
+static DECLCALLBACK(int)   pcibridgeR3Destruct(PPDMDEVINS pDevIns)
+{
+    PDEVPCIBUS pBus = PDMINS_2_DATA(pDevIns, PDEVPCIBUS);
+    if (pBus->papBridgesR3)
+    {
+        PDMDevHlpMMHeapFree(pDevIns, pBus->papBridgesR3);
+        pBus->papBridgesR3 = NULL;
+    }
+    return VINF_SUCCESS;
+}
+
+
+/**
  * The device registration structure
  * for the PCI-to-PCI bridge.
@@ -1730 +1760 @@
     pcibridgeR3Construct,
     /* pfnDestruct */
-    NULL,
+    pcibridgeR3Destruct,
     /* pfnRelocate */
     devpciR3BusRelocate,

trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

@@ -2945 +2945 @@
 
 
-
+/**
+ * @interface_method_impl{PDMDEVREG,pfnConstruct}
+ */
 static DECLCALLBACK(int) ich9pciConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE  pCfg)
 {
@@ -3145 +3147 @@
 }
 
+
+/**
+ * @interface_method_impl{PDMDEVREG,pfnDestruct}
+ */
+static DECLCALLBACK(int) ich9pciDestruct(PPDMDEVINS pDevIns)
+{
+    PDEVPCIROOT pPciRoot = PDMINS_2_DATA(pDevIns, PDEVPCIROOT);
+    if (pPciRoot->PciBus.papBridgesR3)
+    {
+        PDMDevHlpMMHeapFree(pDevIns, pPciRoot->PciBus.papBridgesR3);
+        pPciRoot->PciBus.papBridgesR3 = NULL;
+    }
+    return VINF_SUCCESS;
+}
+
+
 static void ich9pciResetDevice(PPDMPCIDEV pDev)
 {
@@ -3382 +3400 @@
 
 /**
+ * @interface_method_impl{PDMDEVREG,pfnDestruct}
+ */
+static DECLCALLBACK(int) ich9pcibridgeDestruct(PPDMDEVINS pDevIns)
+{
+    PDEVPCIBUS pBus = PDMINS_2_DATA(pDevIns, PDEVPCIBUS);
+    if (pBus->papBridgesR3)
+    {
+        PDMDevHlpMMHeapFree(pDevIns, pBus->papBridgesR3);
+        pBus->papBridgesR3 = NULL;
+    }
+    return VINF_SUCCESS;
+}
+
+/**
  * @copydoc FNPDMDEVRESET
  */
@@ -3429 +3461 @@
     ich9pciConstruct,
     /* pfnDestruct */
-    NULL,
+    ich9pciDestruct,
     /* pfnRelocate */
     devpciR3RootRelocate,
@@ -3485 +3517 @@
     ich9pcibridgeConstruct,
     /* pfnDestruct */
-    NULL,
+    ich9pcibridgeDestruct,
     /* pfnRelocate */
     devpciR3BusRelocate,