Changeset 53535 in vbox

Timestamp:

Dec 13, 2014 7:11:26 PM (10 years ago)

Author:

vboxsync

Message:

DevVGA: fixed loading of pre-VGA_SAVEDSTATE_VERSION_MODE_HINTS saved states

File:

• trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

@@ -1830 +1830 @@
                     AssertRCReturn(rc, rc);
                 }
-                uint32_t cModeHints, cbModeHints;
-                rc = SSMR3GetU32 (pSSM, &cModeHints);
-                AssertRCReturn(rc, rc);
-                rc = SSMR3GetU32 (pSSM, &cbModeHints);
-                AssertRCReturn(rc, rc);
-                memset(&pCtx->aModeHints, ~0, sizeof(pCtx->aModeHints));
-                unsigned iHint;
-                for (iHint = 0; iHint < cModeHints; ++iHint)
-                {
-                    if (   cbModeHints <= sizeof(VBVAMODEHINT)
-                        && iHint < RT_ELEMENTS(pCtx->aModeHints))
-                        rc = SSMR3GetMem(pSSM, &pCtx->aModeHints[iHint],
-                                         cbModeHints);
-                    else
-                        rc = SSMR3Skip(pSSM, cbModeHints);
+
+                if (u32Version >= VGA_SAVEDSTATE_VERSION_MODE_HINTS)
+                {
+                    uint32_t cModeHints, cbModeHints;
+                    rc = SSMR3GetU32 (pSSM, &cModeHints);
                     AssertRCReturn(rc, rc);
+                    rc = SSMR3GetU32 (pSSM, &cbModeHints);
+                    AssertRCReturn(rc, rc);
+                    memset(&pCtx->aModeHints, ~0, sizeof(pCtx->aModeHints));
+                    unsigned iHint;
+                    for (iHint = 0; iHint < cModeHints; ++iHint)
+                    {
+                        if (   cbModeHints <= sizeof(VBVAMODEHINT)
+                            && iHint < RT_ELEMENTS(pCtx->aModeHints))
+                            rc = SSMR3GetMem(pSSM, &pCtx->aModeHints[iHint],
+                                             cbModeHints);
+                        else
+                            rc = SSMR3Skip(pSSM, cbModeHints);
+                        AssertRCReturn(rc, rc);
+                    }
                 }
             }