Changeset 103430 in vbox

Timestamp:

Feb 19, 2024 12:02:55 PM (11 months ago)

Author:

vboxsync

Message:

DrvAudio: No need to use either RTStrCopy[2] or RTStrCat[2] here, memcpy is all you need. bugref:3409

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Audio/DrvAudio.cpp

@@ -4839 +4839 @@
         PDRVAUDIOCFG pAudioCfg = iDir == 0 ? &pThis->CfgIn : &pThis->CfgOut;
         const char  *pszDir    = iDir == 0 ? "In"           : "Out";
+        size_t const cbDir     = iDir == 0 ? sizeof("In")   : sizeof("Out");
 
 #define QUERY_VAL_RET(a_Width, a_szName, a_pValue, a_uDefault, a_ExprValid, a_szValidRange) \
             do { \
-                AssertCompile(sizeof(szNm) - 1 >= (sizeof(a_szName) - 1) + (sizeof("Out") - 1)); \
-                rc = RT_CONCAT(pHlp->pfnCFGMQueryU,a_Width)(pDirNode, RTStrCopy2(szNm, sizeof(szNm), a_szName), a_pValue); \
+                AssertCompile(sizeof(szNm) >= sizeof(a_szName "Out")); \
+                memcpy(szNm, a_szName, sizeof(a_szName)); \
+                rc = RT_CONCAT(pHlp->pfnCFGMQueryU,a_Width)(pDirNode, szNm, a_pValue); \
                 if (rc == VERR_CFGM_VALUE_NOT_FOUND || rc == VERR_CFGM_NO_PARENT) \
                 { \
-                    rc = RT_CONCAT(pHlp->pfnCFGMQueryU,a_Width)(pCfg, RTStrCat2(szNm, sizeof(szNm), pszDir), a_pValue); \
+                    memcpy(&szNm[sizeof(a_szName) - 1], pszDir, cbDir); \
+                    rc = RT_CONCAT(pHlp->pfnCFGMQueryU,a_Width)(pCfg, szNm, a_pValue); \
                     if (rc == VERR_CFGM_VALUE_NOT_FOUND || rc == VERR_CFGM_NO_PARENT) \
                     { \