Changeset 73091 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Jul 12, 2018 1:51:05 PM (6 years ago)

Author:

vboxsync

Message:

lsilogicR3LoadExec: Should check SSMR3GetXxxx return values before using the data. Removed unnecessary variable initialization as it totally messes with my head.

File:

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

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

@@ -4852 +4852 @@
         if (uVersion > LSILOGIC_SAVED_STATE_VERSION_PRE_DIAG_MEM)
         {
+
+            /* Save diagnostic memory register and data regions. */
+            SSMR3GetU32(pSSM, &pThis->u32DiagMemAddr);
             uint32_t cMemRegions = 0;
-
-            /* Save diagnostic memory register and data regions. */
-            SSMR3GetU32   (pSSM, &pThis->u32DiagMemAddr);
-            SSMR3GetU32   (pSSM, &cMemRegions);
+            rc = SSMR3GetU32(pSSM, &cMemRegions);
+            AssertLogRelReturn(rc, rc);
 
             while (cMemRegions)
             {
                 uint32_t u32AddrStart = 0;
+                SSMR3GetU32(pSSM, &u32AddrStart);
                 uint32_t u32AddrEnd = 0;
-                uint32_t cRegion = 0;
-                PLSILOGICMEMREGN pRegion = NULL;
-
-                SSMR3GetU32(pSSM, &u32AddrStart);
-                SSMR3GetU32(pSSM, &u32AddrEnd);
-
-                cRegion = u32AddrEnd - u32AddrStart + 1;
-                pRegion = (PLSILOGICMEMREGN)RTMemAllocZ(RT_OFFSETOF(LSILOGICMEMREGN, au32Data[cRegion]));
+                rc = SSMR3GetU32(pSSM, &u32AddrEnd);
+                AssertLogRelReturn(rc, rc);
+
+                uint32_t         cRegion = u32AddrEnd - u32AddrStart + 1;
+                PLSILOGICMEMREGN pRegion = (PLSILOGICMEMREGN)RTMemAllocZ(RT_OFFSETOF(LSILOGICMEMREGN, au32Data[cRegion]));
                 if (pRegion)
                 {