Changeset 82304 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 30, 2019 8:10:57 PM (5 years ago)

Author:

vboxsync

Message:

DevHDA: Just fail immeidately if there are too many streams in the saved state. (We will fail later on since we won't load the entire data unit. Better to fail with a decent error message.) bugref:9218

File:

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

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

@@ -3945 +3945 @@
         || pHlp->pfnSSMHandleVersion(pSSM)  >= VBOX_FULL_VERSION_MAKE(5, 2, 0))
     {
-        rc = pHlp->pfnSSMGetU64(pSSM, &pThis->u64WalClk);
+        pHlp->pfnSSMGetU64(pSSM, &pThis->u64WalClk);
         rc = pHlp->pfnSSMGetU8(pSSM, &pThis->u8IRQL);
         AssertRCReturn(rc, rc);
@@ -3956 +3956 @@
     rc = pHlp->pfnSSMGetU32(pSSM, &cStreams);
     AssertRCReturn(rc, rc);
-
-    /** @todo r=bird: Sanity? No, insanity. You'll end up failing later on
-     *        because you don't load all your state, so what's the point.  Just
-     *        admit to a problem immediately, there is no hiding it! */
     if (cStreams > HDA_MAX_STREAMS)
-        cStreams = HDA_MAX_STREAMS; /* Sanity. */
-
+        return pHlp->pfnSSMSetLoadError(pSSM, VERR_SSM_DATA_UNIT_FORMAT_CHANGED, RT_SRC_POS,
+                                        N_("State contains %u streams while %u is the maximum supported"),
+                                        cStreams, HDA_MAX_STREAMS);
     Log2Func(("cStreams=%RU32\n", cStreams));