Changeset 24272 in vbox for trunk/src

Timestamp:

Nov 2, 2009 4:44:27 PM (15 years ago)

Author:

vboxsync

Message:

PDMDevice.cpp: Check the number of devices instances against the max number.

File:

• trunk/src/VBox/VMM/PDMDevice.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -209 +209 @@
 
         /* Enumerate the device instances. */
+        uint32_t const iStart = i;
         for (pInstanceNode = CFGMR3GetFirstChild(pCur); pInstanceNode; pInstanceNode = CFGMR3GetNextChild(pInstanceNode))
         {
@@ -227 +228 @@
             i++;
         }
+
+        /* check the number of instances */
+        if (i - iStart > pDev->pDevReg->cMaxInstances)
+            AssertLogRelMsgFailedReturn(("Configuration error: Too many instances of %s was configured: %u, max %u\n",
+                                         szName, i - iStart, pDev->pDevReg->cMaxInstances),
+                                        VERR_PDM_TOO_MANY_DEVICE_INSTANCES);
     } /* devices */
     Assert(i == cDevs);
@@ -285 +292 @@
          * Allocate the device instance.
          */
+        AssertReturn(paDevs[i].pDev->cInstances < paDevs[i].pDev->pDevReg->cMaxInstances, VERR_PDM_TOO_MANY_DEVICE_INSTANCES);
         size_t cb = RT_OFFSETOF(PDMDEVINS, achInstanceData[paDevs[i].pDev->pDevReg->cbInstance]);
         cb = RT_ALIGN_Z(cb, 16);
@@ -357 +365 @@
          * Call the constructor.
          */
+        paDevs[i].pDev->cInstances++;
         Log(("PDM: Constructing device '%s' instance %d...\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance));
         rc = pDevIns->pDevReg->pfnConstruct(pDevIns, pDevIns->iInstance, pDevIns->pCfgHandle);
@@ -362 +371 @@
         {
             LogRel(("PDM: Failed to construct '%s'/%d! %Rra\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, rc));
+            paDevs[i].pDev->cInstances--;
             /* because we're damn lazy right now, we'll say that the destructor will be called even if the constructor fails. */
             return rc;