Changeset 104588 in vbox

Timestamp:

May 13, 2024 12:14:03 PM (7 months ago)

Author:

vboxsync

Message:

Devices/Security/DevTpm.cpp: Return if pfnSSMGetStructEx() fails, don't call pfnGetBufferSize() twice in RT_MIN() (harmless as pfnGetBufferSize() has no side effects), bugref:3409

File:

• trunk/src/VBox/Devices/Security/DevTpm.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Security/DevTpm.cpp

@@ -1596 +1596 @@
     {
         rc = pHlp->pfnSSMGetStructEx(pSSM, pThis, sizeof(*pThis), 0 /*fFlags*/, &g_aTpmFields[0], NULL);
+        AssertRCReturn(rc, rc);
 
         /* The marker. */
@@ -1748 +1749 @@
         AssertLogRelMsgReturn(pThisCC->pDrvTpm, ("TPM#%d: Driver is missing the TPM interface.\n", iInstance), VERR_PDM_MISSING_INTERFACE);
 
-        pThis->cbCmdResp     = RT_MIN(pThisCC->pDrvTpm->pfnGetBufferSize(pThisCC->pDrvTpm), TPM_DATA_BUFFER_SIZE_MAX);
+        size_t cbBufDrv = pThisCC->pDrvTpm->pfnGetBufferSize(pThisCC->pDrvTpm);
+        pThis->cbCmdResp     = RT_MIN(cbBufDrv, TPM_DATA_BUFFER_SIZE_MAX);
         pThis->fLocChangeSup = pThisCC->pDrvTpm->pfnGetLocalityMax(pThisCC->pDrvTpm) > 0;