Changeset 82303 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Nov 30, 2019 6:24:28 PM (5 years ago)

Author:

vboxsync

Message:

DevHDA: Try more consistently to check status codes before using loaded state. bugref:9218

File:

• trunk/src/VBox/Devices/Audio/DevHDA.cpp (modified) (5 diffs)

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

@@ -3914 +3914 @@
     uint32_t cRegs;
     rc = pHlp->pfnSSMGetU32(pSSM, &cRegs); AssertRCReturn(rc, rc);
+    AssertRCReturn(rc, rc);
     if (cRegs != RT_ELEMENTS(pThis->au32Regs))
         LogRel(("HDA: SSM version cRegs is %RU32, expected %RU32\n", cRegs, RT_ELEMENTS(pThis->au32Regs)));
@@ -3920 +3921 @@
     {
         pHlp->pfnSSMGetMem(pSSM, pThis->au32Regs, sizeof(pThis->au32Regs));
-        pHlp->pfnSSMSkip(pSSM, sizeof(uint32_t) * (cRegs - RT_ELEMENTS(pThis->au32Regs)));
+        rc = pHlp->pfnSSMSkip(pSSM, sizeof(uint32_t) * (cRegs - RT_ELEMENTS(pThis->au32Regs)));
+        AssertRCReturn(rc, rc);
     }
     else
-        pHlp->pfnSSMGetMem(pSSM, pThis->au32Regs, sizeof(uint32_t) * cRegs);
+    {
+        rc = pHlp->pfnSSMGetMem(pSSM, pThis->au32Regs, sizeof(uint32_t) * cRegs);
+        AssertRCReturn(rc, rc);
+    }
 
     /* Make sure to update the base addresses first before initializing any streams down below. */
@@ -3941 +3946 @@
     {
         rc = pHlp->pfnSSMGetU64(pSSM, &pThis->u64WalClk);
-        AssertRCReturn(rc, rc);
         rc = pHlp->pfnSSMGetU8(pSSM, &pThis->u8IRQL);
         AssertRCReturn(rc, rc);
@@ -4005 +4009 @@
          * Load period state.
          */
-        hdaR3StreamPeriodInit(&pStream->State.Period,
-                              pStream->u8SD, pStream->u16LVI, pStream->u32CBL, &pStream->State.Cfg);
+        hdaR3StreamPeriodInit(&pStream->State.Period, pStream->u8SD, pStream->u16LVI, pStream->u32CBL, &pStream->State.Cfg);
 
         rc = pHlp->pfnSSMGetStructEx(pSSM, &pStream->State.Period, sizeof(HDASTREAMPERIOD),
@@ -4016 +4019 @@
          */
         uint32_t cbCircBufSize = 0;
-        rc = pHlp->pfnSSMGetU32(pSSM, &cbCircBufSize); /* cbCircBuf */
+        pHlp->pfnSSMGetU32(pSSM, &cbCircBufSize); /* cbCircBuf */
         uint32_t cbCircBufUsed = 0;
         rc = pHlp->pfnSSMGetU32(pSSM, &cbCircBufUsed); /* cbCircBuf */