Changeset 67806 in vbox

Timestamp:

Jul 5, 2017 3:48:20 PM (8 years ago)

Author:

vboxsync

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

116730

Message:

Devices: when attaching a driver, don't pass a local variable as description

Location:

trunk/src/VBox/Devices

Files:

• Audio/DevHDA.cpp (modified) (1 diff)
• Audio/DevIchAc97.cpp (modified) (1 diff)
• Audio/DevSB16.cpp (modified) (1 diff)
• Storage/DevAHCI.cpp (modified) (7 diffs)
• Storage/DevBusLogic.cpp (modified) (2 diffs)
• Storage/DevLsiLogicSCSI.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Audio/DevHDA.cpp ¶

@@ -6895 +6895 @@
      * Attach driver.
      */
-    char *pszDesc = NULL;
+    char *pszDesc;
     if (RTStrAPrintf(&pszDesc, "Audio driver port (HDA) for LUN#%u", uLUN) <= 0)
-        AssertReleaseMsgReturn(pszDesc,
-                               ("Not enough memory for HDA driver port description of LUN #%u\n", uLUN),
-                               VERR_NO_MEMORY);
+        AssertLogRelFailedReturn(VERR_NO_MEMORY);
 
     PPDMIBASE pDrvBase;

trunk/src/VBox/Devices/Audio/DevIchAc97.cpp ¶

@@ -3221 +3221 @@
      * Attach driver.
      */
-    char *pszDesc = NULL;
+    char *pszDesc;
     if (RTStrAPrintf(&pszDesc, "Audio driver port (AC'97) for LUN #%u", uLUN) <= 0)
-        AssertReleaseMsgReturn(pszDesc,
-                               ("Not enough memory for AC'97 driver port description of LUN #%u\n", uLUN),
-                               VERR_NO_MEMORY);
+        AssertLogRelFailedReturn(VERR_NO_MEMORY);
 
     PPDMIBASE pDrvBase;

trunk/src/VBox/Devices/Audio/DevSB16.cpp ¶

@@ -219 +219 @@
      * Attach driver.
      */
-    char *pszDesc = NULL;
+    char *pszDesc;
     if (RTStrAPrintf(&pszDesc, "Audio driver port (SB16) for LUN #%u", uLUN) <= 0)
-        AssertReleaseMsgReturn(pszDesc,
-                               ("Not enough memory for SB16 driver port description of LUN #%u\n", uLUN),
-                               VERR_NO_MEMORY);
+        AssertLogRelFailedReturn(VERR_NO_MEMORY);
 
     PPDMIBASE pDrvBase;

trunk/src/VBox/Devices/Storage/DevAHCI.cpp ¶

@@ -6020 +6020 @@
     for (i = 0; i < pThis->cPortsImpl; i++)
     {
-        char szName[24];
-        RTStrPrintf(szName, sizeof(szName), "Port%u", i);
+        char *pszName;
+        if (RTStrAPrintf(&pszName, "Port%u", i) <= 0)
+            AssertLogRelFailedReturn(VERR_NO_MEMORY);
 
         PAHCIPort pAhciPort      = &pThis->ahciPort[i];
@@ -6039 +6040 @@
 
         /* Query per port configuration options if available. */
-        PCFGMNODE pCfgPort = CFGMR3GetChild(pDevIns->pCfg, szName);
+        PCFGMNODE pCfgPort = CFGMR3GetChild(pDevIns->pCfg, pszName);
         if (pCfgPort)
         {
@@ -6051 +6052 @@
          * Attach the block driver
          */
-        rc = PDMDevHlpDriverAttach(pDevIns, pAhciPort->iLUN, &pAhciPort->IBase, &pAhciPort->pDrvBase, szName);
+        rc = PDMDevHlpDriverAttach(pDevIns, pAhciPort->iLUN, &pAhciPort->IBase, &pAhciPort->pDrvBase, pszName);
         if (RT_SUCCESS(rc))
         {
@@ -6057 +6058 @@
             if (RT_FAILURE(rc))
             {
-                Log(("%s: Failed to configure the %s.\n", __FUNCTION__, szName));
+                Log(("%s: Failed to configure the %s.\n", __FUNCTION__, pszName));
                 return rc;
             }
@@ -6068 +6069 @@
              * Init vendor product data.
              */
-            rc = ahciR3VpdInit(pDevIns, pAhciPort, szName);
+            rc = ahciR3VpdInit(pDevIns, pAhciPort, pszName);
             if (RT_FAILURE(rc))
                 return rc;
@@ -6078 +6079 @@
 
             rc = PDMDevHlpThreadCreate(pDevIns, &pAhciPort->pAsyncIOThread, pAhciPort, ahciAsyncIOLoop,
-                                       ahciAsyncIOLoopWakeUp, 0, RTTHREADTYPE_IO, szName);
+                                       ahciAsyncIOLoopWakeUp, 0, RTTHREADTYPE_IO, pszName);
             if (RT_FAILURE(rc))
                 return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
-                                           N_("AHCI: Failed to create worker thread %s"), szName);
+                                           N_("AHCI: Failed to create worker thread %s"), pszName);
         }
         else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
@@ -6087 +6088 @@
             pAhciPort->pDrvBase = NULL;
             rc = VINF_SUCCESS;
-            LogRel(("AHCI: %s: No driver attached\n", szName));
+            LogRel(("AHCI: %s: No driver attached\n", pszName));
         }
         else
             return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
-                                       N_("AHCI: Failed to attach drive to %s"), szName);
+                                       N_("AHCI: Failed to attach drive to %s"), pszName);
     }
 

trunk/src/VBox/Devices/Storage/DevBusLogic.cpp ¶

@@ -4154 +4154 @@
         PBUSLOGICDEVICE pDevice = &pThis->aDeviceStates[i];
 
-        RTStrPrintf(szName, sizeof(szName), "Device%u", i);
+        char *pszName;
+        if (RTStrAPrintf(&pszName, "Device%u", i) < 0)
+            AssertLogRelFailedReturn(VERR_NO_MEMORY);
 
         /* Initialize static parts of the device. */
@@ -4174 +4176 @@
 
         /* Attach SCSI driver. */
-        rc = PDMDevHlpDriverAttach(pDevIns, pDevice->iLUN, &pDevice->IBase, &pDevice->pDrvBase, szName);
+        rc = PDMDevHlpDriverAttach(pDevIns, pDevice->iLUN, &pDevice->IBase, &pDevice->pDrvBase, pszName);
         if (RT_SUCCESS(rc))
         {

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp ¶

@@ -5595 +5595 @@
     for (unsigned i = 0; i < pThis->cDeviceStates; i++)
     {
-        char szName[24];
         PLSILOGICDEVICE pDevice = &pThis->paDeviceStates[i];
 
@@ -5613 +5612 @@
         pDevice->ILed.pfnQueryStatusLed                  = lsilogicR3DeviceQueryStatusLed;
 
-        RTStrPrintf(szName, sizeof(szName), "Device%u", i);
+        char *pszName;
+        if (RTStrAPrintf(&pszName, "Device%u", i) <= 0)
+            AssertLogRelFailedReturn(VERR_NO_MEMORY);
 
         /* Attach SCSI driver. */
-        rc = PDMDevHlpDriverAttach(pDevIns, pDevice->iLUN, &pDevice->IBase, &pDevice->pDrvBase, szName);
+        rc = PDMDevHlpDriverAttach(pDevIns, pDevice->iLUN, &pDevice->IBase, &pDevice->pDrvBase, pszName);
         if (RT_SUCCESS(rc))
         {
@@ -5641 +5642 @@
             pDevice->pDrvBase = NULL;
             rc = VINF_SUCCESS;
-            Log(("LsiLogic: no driver attached to device %s\n", szName));
+            Log(("LsiLogic: no driver attached to device %s\n", pszName));
         }
         else
         {
-            AssertLogRelMsgFailed(("LsiLogic: Failed to attach %s\n", szName));
+            AssertLogRelMsgFailed(("LsiLogic: Failed to attach %s\n", pszName));
             return rc;
         }