Changeset 4192 in vbox

Timestamp:

Aug 16, 2007 10:50:08 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

23684

Message:

Don't crash on misconfiguration (missing buffer). Ignore missing buffer on SSMAFTER_DEBUG_IT.

File:

• trunk/src/VBox/Devices/Storage/DevATA.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -5846 +5846 @@
             SSMR3GetU32(pSSMHandle, &pData->aCts[i].aIfs[j].cbIOBuffer);
             if (pData->aCts[i].aIfs[j].cbIOBuffer)
-                SSMR3GetMem(pSSMHandle, pData->aCts[i].aIfs[j].CTXSUFF(pbIOBuffer), pData->aCts[i].aIfs[j].cbIOBuffer);
+            {
+                if (pData->aCts[i].aIfs[j].CTXSUFF(pbIOBuffer))
+                    SSMR3GetMem(pSSMHandle, pData->aCts[i].aIfs[j].CTXSUFF(pbIOBuffer), pData->aCts[i].aIfs[j].cbIOBuffer);
+                else
+                {
+                    LogRel(("ATA: No buffer for %d/%d\n", i, j));
+                    if (SSMR3HandleGetAfter(pSSMHandle) != SSMAFTER_DEBUG_IT)
+                        break;
+                    /* skip the buffer if we're loading for the debugger / animator. */
+                    uint8_t u8Ignored;
+                    size_t cbLeft = pData->aCts[i].aIfs[j].cbIOBuffer;
+                    while (cbLeft-- > 0)
+                        SSMR3GetU8(pSSMHandle, &u8Ignored);
+                }
+            }
             else
                 Assert(pData->aCts[i].aIfs[j].CTXSUFF(pbIOBuffer) == NULL);